Prechádzať zdrojové kódy

installer: use chroot instead of -R arg for useradd/chpasswd

this should mitigate/resolve issues where mismatches between host and TARGETDIR
cause errors when adding the primary user

fixes #18
fixes #181
fixes #306
classabbyamp 2 rokov pred
rodič
commit
e8f015ce55
1 zmenil súbory, kde vykonal 3 pridanie a 3 odobranie
  1. 3 3
      installer.sh.in

+ 3 - 3
installer.sh.in

@@ -660,7 +660,7 @@ menu_rootpassword() {
 }
 
 set_rootpassword() {
-    echo "root:$(get_option ROOTPASSWORD)" | chpasswd -R $TARGETDIR -c SHA512
+    echo "root:$(get_option ROOTPASSWORD)" | chroot $TARGETDIR chpasswd -c SHA512
 }
 
 menu_useraccount() {
@@ -769,10 +769,10 @@ set_useraccount() {
     [ -z "$USERPASSWORD_DONE" ] && return
     [ -z "$USERNAME_DONE" ] && return
     [ -z "$USERGROUPS_DONE" ] && return
-    useradd -R "$TARGETDIR" -m -G "$(get_option USERGROUPS)" \
+    chroot $TARGETDIR useradd -m -G "$(get_option USERGROUPS)" \
         -c "$(get_option USERNAME)" "$(get_option USERLOGIN)"
     echo "$(get_option USERLOGIN):$(get_option USERPASSWORD)" | \
-        chpasswd -R $TARGETDIR -c SHA512
+        chroot $TARGETDIR chpasswd -c SHA512
 }
 
 menu_bootloader() {