This commit is contained in:
Ian Gulliver
2017-03-30 14:39:45 -07:00
parent e0af42d543
commit c1b4e350ea
3 changed files with 3 additions and 2 deletions

View File

@@ -60,7 +60,7 @@ set default=%(default_entry)d
set fallback=%(fallback_entry)d set fallback=%(fallback_entry)d
""" % { """ % {
'default_entry': default_entry, 'default_entry': default_entry,
'fallback_entry': fallback_entry, 'fallback_entry': fallback_entry if fallback_entry else default_entry,
}) })
fh.flush() fh.flush()

View File

@@ -29,7 +29,7 @@ def main():
fh.write("""\ fh.write("""\
#!/bin/bash #!/bin/bash
set -ex set -ex
e2fsck -a /persistent e2fsck -y LABEL=PERSISTENT
mount -o noatime LABEL=PERSISTENT /persistent mount -o noatime LABEL=PERSISTENT /persistent
""") """)

View File

@@ -28,6 +28,7 @@ def main():
os.fchmod(fh.fileno(), 0o755) os.fchmod(fh.fileno(), 0o755)
fh.write("""\ fh.write("""\
#!/bin/bash #!/bin/bash
e2fsck -p LABEL=SYSTEMID
mount -o data=journal,noatime,sync LABEL=SYSTEMID /systemid mount -o data=journal,noatime,sync LABEL=SYSTEMID /systemid
. /systemid/systemid . /systemid/systemid
echo ${SYSTEMID} > /etc/hostname echo ${SYSTEMID} > /etc/hostname