Merge pull request #839 from aschnell/master

tiny improvements to pam scripts
openSUSE · Sep 19, 2023 · 1ce4369 · 1ce4369
2 parents 0641911 + 9b97a8b
commit 1ce4369
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 10 deletions.
diff --git a/scripts/pam_snapper_homeconvert.sh b/scripts/pam_snapper_homeconvert.sh
@@ -13,7 +13,6 @@ CMD_BTRFS="/sbin/btrfs"
 CMD_SNAPPER="/usr/bin/snapper"
 CMD_EGREP="grep -E"
 CMD_PAM_CONFIG="/usr/sbin/pam-config"
-CMD_SED="sed"
 CMD_USERADD="useradd -m"
 CMD_USERDEL="userdel -r"
 CMD_CHOWN="chown"
@@ -137,7 +136,7 @@ function createsnapperconfig () {
 		fi
 		echo "Create snapper configuration for user ${MYUSER}"
 		${CMD_SNAPPER} -c home_${MYUSER} create-config ${HOMEHOME}/${MYUSER}
-		${CMD_SED} -i -e "s/ALLOW_USERS=\"\"/ALLOW_USERS=\"${MYUSER}\"/g" ${SNAPPERCFGDIR}/home_${MYUSER}
+		${CMD_SNAPPER} -c home_${MYUSER} set-config ALLOW_USERS=${MYUSER}
 	fi
 	${CMD_CHMOD} 755 ${HOMEHOME}/${MYUSER}/.snapshots
 }

diff --git a/scripts/pam_snapper_pamconfig.sh b/scripts/pam_snapper_pamconfig.sh
@@ -13,7 +13,6 @@ CMD_BTRFS="/sbin/btrfs"
 CMD_SNAPPER="/usr/bin/snapper"
 CMD_EGREP="grep -E"
 CMD_PAM_CONFIG="/usr/sbin/pam-config"
-CMD_SED="sed"
 CMD_USERADD="useradd -m"
 CMD_USERDEL="userdel -r"
 CMD_CHOWN="chown"

diff --git a/scripts/pam_snapper_useradd.sh b/scripts/pam_snapper_useradd.sh
@@ -13,9 +13,7 @@ CMD_BTRFS="/sbin/btrfs"
 CMD_SNAPPER="/usr/bin/snapper"
 CMD_EGREP="grep -E"
 CMD_PAM_CONFIG="/usr/sbin/pam-config"
-CMD_SED="sed"
-CMD_USERADD="useradd"
-CMD_USERDEL="userdel -r"
+CMD_USERADD="useradd --no-create-home"
 CMD_CHOWN="chown"
 CMD_CHMOD="chmod"
 CMD_CPA="cp -a"
@@ -47,7 +45,7 @@ if [ ${DRYRUN} == 0 ] ; then
 	${CMD_BTRFS} subvol create ${HOMEHOME}/${MYUSER}
 	# Create snapper config for USER
 	${CMD_SNAPPER} -c home_${MYUSER} create-config ${HOMEHOME}/${MYUSER}
-	${CMD_SED} -i -e "s/ALLOW_USERS=\"\"/ALLOW_USERS=\"${MYUSER}\"/g" ${SNAPPERCFGDIR}/home_${MYUSER}
+	${CMD_SNAPPER} -c home_${MYUSER} set-config ALLOW_USERS=${MYUSER}
 	# Create USER
 	${CMD_USERADD} ${MYUSER}
 	# Give USER skeleton files

diff --git a/scripts/pam_snapper_userdel.sh b/scripts/pam_snapper_userdel.sh
@@ -13,9 +13,7 @@ CMD_BTRFS="/sbin/btrfs"
 CMD_SNAPPER="/usr/bin/snapper"
 CMD_EGREP="grep -E"
 CMD_PAM_CONFIG="/usr/sbin/pam-config"
-CMD_SED="sed"
-CMD_USERADD="useradd -m"
-CMD_USERDEL="userdel -r"
+CMD_USERDEL="userdel --remove"
 CMD_CHOWN="chown"
 #
 SNAPPERCFGDIR="/etc/snapper/configs"