diff options
author | Eric Hameleers <alien@slackware.com> | 2016-06-21 23:23:24 +0200 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2016-06-21 23:23:24 +0200 |
commit | 6d2d94ad580fe2c6bde855447498851dd00f0910 (patch) | |
tree | 39f60f27e1ac4e839c2a6251259109979326c3d9 /iso2usb.sh | |
parent | f41c17e3d07debf0c6a5f9023115561bf56a6f24 (diff) | |
download | liveslak-6d2d94ad580fe2c6bde855447498851dd00f0910.tar.gz liveslak-6d2d94ad580fe2c6bde855447498851dd00f0910.tar.xz |
iso2usb.sh: try to fix custom persistence configuration.
Diffstat (limited to 'iso2usb.sh')
-rw-r--r-- | iso2usb.sh | 12 |
1 files changed, 9 insertions, 3 deletions
@@ -187,17 +187,23 @@ update_initrd() { echo "$OLDLUKS" >> luksdev if [ "${PERSISTENCE}" != "${DEF_PERSISTENCE}" ]; then # If the user specified a nonstandard persistence, use that: + echo "--- Updating persistence from '$OLDPERSISTENCE' to '$PERSISTENCE'" sed -i -e "s,^PERSISTENCE=.*,PERSISTENCE=\"${PERSISTENCE}\"," init elif ["${PERSISTENCE}" != "${OLDPERSISTENCE}" ]; then - # The user did not specify persistence, re-use the custome value: + # The user did not specify persistence, re-use the retrieved value: sed -i -e "s,^PERSISTENCE=.*,PERSISTENCE=\"${OLDPERSISTENCE}\"," init - echo "--- Updating 'persistence' from '$PERSISTENCE' to '$OLDPERSISTENCE':" + echo "--- Updating persistence from '$PERSISTENCE' to '$OLDPERSISTENCE'" PERSISTENCE="${OLDPERSISTENCE}" fi else - echo "--- Updating 'waitforroot' time from '$OLDWAIT' to '$WAIT':" + if [ "${PERSISTENCE}" != "${DEF_PERSISTENCE}" ]; then + # If the user specified a nonstandard persistence, use that: + echo "--- Updating persitence from '$DEF_PERSISTENCE' to '$PERSISTENCE'" + sed -i -e "s,^PERSISTENCE=.*,PERSISTENCE=\"${PERSISTENCE}\"," init + fi fi + echo "--- Updating 'waitforroot' time from '$OLDWAIT' to '$WAIT'" echo ${WAIT} > wait-for-root if [ $DOLUKS -eq 1 -a -n "${LUKSHOME}" ]; then |