From c6d71f5faa1c41425d161e3c06d8c03b64475cbf Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Wed, 20 Dec 2017 23:14:25 +0100 Subject: [PATCH] rootfsinstall.sh: update command line for Baytrail kernel and make chpass usage pwdutils compatible --- src/rootfsinstall.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/rootfsinstall.sh b/src/rootfsinstall.sh index 03d29b1..e1122f0 100755 --- a/src/rootfsinstall.sh +++ b/src/rootfsinstall.sh @@ -414,7 +414,7 @@ if [ "${SAVE_ROOT_PARTUUID}" -a "${GROWIMAGE}" ]; then fi if [ "$SETUSERPASSWORD" ]; then - echo "$SETUSERPASSWORD" | chroot $ROOTMP chpasswd -m || { + echo "$SETUSERPASSWORD" | chroot $ROOTMP chpasswd -c MD5 || { echo "ERROR: unable to set user password; aborting." exit 1 } @@ -498,7 +498,7 @@ search --no-floppy --label --set=root $VOLUME_LABEL menuentry "default" { echo "Loading /boot/$KERNELDEST" -linux /boot/$KERNELDEST root=/dev/sda2 ro intel_idle.max_cstate=1 intel_pstate=disabled fbcon=rotate:1 quiet splash +linux /boot/$KERNELDEST root=/dev/sda2 ro fbcon=rotate:1 quiet splash echo "Loading /boot/$INITRAMFSDEST" initrd /boot/$INITRAMFSDEST }