Skip to content

Commit f56a1b3

Browse files
committed
move squashfs, build with MKSQUASHFS=yes ./build_image.sh ubuntu-focal-rescue
1 parent f2b80b1 commit f56a1b3

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

oscfg/ubuntu.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -269,8 +269,5 @@ ExecStart=
269269
ExecStart=-/sbin/agetty --noissue --autologin root --noclear %I
270270
Type=idle
271271
EOF
272-
273-
# build squashfs image
274-
mksquashfs "$WORK" "$1-$DATE.squashfs" -comp xz -noappend -progress
275272
fi
276273
}

scripts/base.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,11 @@ EOF
117117

118118
umount "$WORK/proc" "$WORK/sys" "$WORK/dev" || umount -l "$WORK/proc" "$WORK/sys" "$WORK/dev" || true
119119

120+
# build squashfs image if requested NOW
121+
if [ x"$MKSQUASHFS" != x ]; then
122+
mksquashfs "$WORK" "$1-$DATE.squashfs" -comp xz -noappend -progress
123+
fi
124+
120125
echo "Syncing..."
121126
umount "$WORK"
122127
"$QEMUNBD" -d "$NBD"

0 commit comments

Comments
 (0)