diff options
| author | makefu <github@syntax-fehler.de> | 2017-01-25 23:23:29 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2017-01-25 23:23:29 +0100 |
| commit | bf405736962fd20df738f84665e5fc7f8d74e72d (patch) | |
| tree | ae01054fe88089d6476b3c1b1952066fd6c79092 /krebs/4lib/infest | |
| parent | 7e1bd2729e11e5c63749c69093359de0bb3329b2 (diff) | |
| parent | 89c5b22129d3cb875d16a3171a4e3ab3bee9cb0a (diff) | |
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'krebs/4lib/infest')
| -rw-r--r-- | krebs/4lib/infest/prepare.sh | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/krebs/4lib/infest/prepare.sh b/krebs/4lib/infest/prepare.sh index e265b0e67..3f5d66431 100644 --- a/krebs/4lib/infest/prepare.sh +++ b/krebs/4lib/infest/prepare.sh @@ -143,10 +143,10 @@ prepare_common() {( mkdir -p /mnt/boot if mount | grep -Fq ' on /boot type '; then - bootdev=$(mount | grep " on /boot type " | sed 's/ .*//') - mount $bootdev /mnt/boot + bootpart=$(mount | grep ' on /boot type ' | sed 's/ .*//') + mount $bootpart /mnt/boot else - mount --bind /boot/ /mnt/boot + mount --bind /boot /mnt/boot fi fi @@ -155,10 +155,12 @@ prepare_common() {( # prepare install directory # - rootpart=$(mount | grep " on / type" | sed 's/ .*//') + rootpart=$(mount | grep ' on / type ' | sed 's/ .*//') mkdir -p /mnt/etc/nixos mkdir -m 0555 -p /mnt/var/empty + mkdir -p /mnt/var/src + touch /mnt/var/src/.populate if ! mount | grep -Fq "$rootpart on /mnt/root type "; then mkdir -p /mnt/root |