diff options
| author | Daniel Baumann <daniel@debian.org> | 2012-06-05 18:32:19 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2012-06-05 19:35:56 +0200 |
| commit | 155d7302a9325861c11cff8b5a19344e8dd508a3 (patch) | |
| tree | 0fc637eb975599abf2c1c357ea623497aa2d7b80 | |
| parent | a76532ce1ffc67df5f94b1483e53661756112584 (diff) | |
| download | live-boot-155d7302a9325861c11cff8b5a19344e8dd508a3.tar.gz live-boot-155d7302a9325861c11cff8b5a19344e8dd508a3.zip | |
Updating swapon handling to new parameter handling.
| -rwxr-xr-x | initramfs-tools/scripts/live-bottom/12fstab | 2 | ||||
| -rwxr-xr-x | scripts/boot/cmdline.sh | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/initramfs-tools/scripts/live-bottom/12fstab b/initramfs-tools/scripts/live-bottom/12fstab index e0b248a..d71800d 100755 --- a/initramfs-tools/scripts/live-bottom/12fstab +++ b/initramfs-tools/scripts/live-bottom/12fstab @@ -44,7 +44,7 @@ then echo "tmpfs /tmp tmpfs nosuid,nodev 0 0" >> "${FSTAB}" fi -if [ -n "${SWAPON}" ] +if [ -n "${LIVE_SWAPON}" ] then devices="" diff --git a/scripts/boot/cmdline.sh b/scripts/boot/cmdline.sh index 18a9a2c..fb4e0cb 100755 --- a/scripts/boot/cmdline.sh +++ b/scripts/boot/cmdline.sh @@ -12,6 +12,11 @@ Cmdline () export LIVE_READ_ONLY ;; + live-boot.swapon) + LIVE_SWAPON="true" + export LIVE_SWAPON + ;; + live-boot.verify-checksums|verify-checksums) LIVE_VERIFY_CHECKSUMS="true" export LIVE_VERIFY_CHECKSUMS @@ -177,11 +182,6 @@ Cmdline () ramdisk_size="${ARGUMENT#ramdisk-size=}" ;; - swapon) - SWAPON="true" - export SWAPON - ;; - persistence) PERSISTENCE="true" export PERSISTENCE |