From c1b4e350ea4d841bb5dcd44b07db814f46beed53 Mon Sep 17 00:00:00 2001 From: Ian Gulliver Date: Thu, 30 Mar 2017 14:39:45 -0700 Subject: [PATCH] Fixes --- client/update_grub.py | 2 +- server/modules/persistent.py | 2 +- server/modules/systemid.py | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/client/update_grub.py b/client/update_grub.py index 7645d48..3f4dc86 100755 --- a/client/update_grub.py +++ b/client/update_grub.py @@ -60,7 +60,7 @@ set default=%(default_entry)d set fallback=%(fallback_entry)d """ % { 'default_entry': default_entry, - 'fallback_entry': fallback_entry, + 'fallback_entry': fallback_entry if fallback_entry else default_entry, }) fh.flush() diff --git a/server/modules/persistent.py b/server/modules/persistent.py index 373001b..f22867a 100755 --- a/server/modules/persistent.py +++ b/server/modules/persistent.py @@ -29,7 +29,7 @@ def main(): fh.write("""\ #!/bin/bash set -ex -e2fsck -a /persistent +e2fsck -y LABEL=PERSISTENT mount -o noatime LABEL=PERSISTENT /persistent """) diff --git a/server/modules/systemid.py b/server/modules/systemid.py index 052597f..098e7ed 100755 --- a/server/modules/systemid.py +++ b/server/modules/systemid.py @@ -28,6 +28,7 @@ def main(): os.fchmod(fh.fileno(), 0o755) fh.write("""\ #!/bin/bash +e2fsck -p LABEL=SYSTEMID mount -o data=journal,noatime,sync LABEL=SYSTEMID /systemid . /systemid/systemid echo ${SYSTEMID} > /etc/hostname