Revert "Remove fstab from squashfs images"

This reverts commit f96e874ed1.
raspi-desktop-1
Steve Langasek 4 years ago
parent b907a03f54
commit d9de270189

@ -35,7 +35,6 @@ mkdir -p config
cp -af /usr/share/livecd-rootfs/live-build/functions config/functions cp -af /usr/share/livecd-rootfs/live-build/functions config/functions
cp -af /usr/share/livecd-rootfs/live-build/lb_*_layered config/ cp -af /usr/share/livecd-rootfs/live-build/lb_*_layered config/
cp -af /usr/share/livecd-rootfs/live-build/snap-seed-parse.py config/snap-seed-parse cp -af /usr/share/livecd-rootfs/live-build/snap-seed-parse.py config/snap-seed-parse
cp -af /usr/share/livecd-rootfs/live-build/squashfs-exclude-files config/
mkdir -p config/package-lists mkdir -p config/package-lists

@ -289,17 +289,6 @@ create_vmdk() {
rm -rf ${scratch_d} rm -rf ${scratch_d}
} }
create_squashfs() {
local config_dir rootfs_dir squashfs_file
rootfs_dir="$1"
squashfs_file="$2"
config_dir="$PWD/config"
(cd $rootfs_dir &&
mksquashfs . $squashfs_file -no-progress -xattrs -comp xz \
-ef "$config_dir/squashfs-exclude-files")
}
create_derivative() { create_derivative() {
# arg1 is the disk type # arg1 is the disk type
# arg2 is the new name # arg2 is the new name

@ -8,15 +8,14 @@ if [ -n "$SUBARCH" ]; then
exit 0 exit 0
fi fi
. config/functions
# This is the directory created by create-root-dir.binary # This is the directory created by create-root-dir.binary
rootfs_dir=rootfs.dir rootfs_dir=rootfs.dir
squashfs_f="$PWD/livecd.ubuntu-cpc.squashfs" squashfs_f="$PWD/livecd.ubuntu-cpc.squashfs"
cp $rootfs_dir.manifest $squashfs_f.manifest cp $rootfs_dir.manifest $squashfs_f.manifest
# fstab is omitted from the squashfs cp $rootfs_dir.filelist $squashfs_f.filelist
grep -v '^/etc/fstab$' $rootfs_dir.filelist >$squashfs_f.filelist
create_squashfs $rootfs_dir $squashfs_f (cd $rootfs_dir &&
mksquashfs . $squashfs_f \
-no-progress -xattrs -comp xz )

@ -30,4 +30,6 @@ squashfs_f_manifest="${squashfs_f}.manifest"
create_manifest "binary/boot/squashfs.dir" "${squashfs_f_manifest}" create_manifest "binary/boot/squashfs.dir" "${squashfs_f_manifest}"
create_squashfs "binary/boot/squashfs.dir/" ${squashfs_f} (cd "binary/boot/squashfs.dir/" &&
mksquashfs . ${squashfs_f} \
-no-progress -xattrs -comp xz )

@ -91,4 +91,6 @@ find $OVERLAY_ROOT/var/lib/snapd/ -name 'lxd_*.snap' -delete
squashfs_f="${PWD}/livecd.${PROJECT}.installer.squashfs" squashfs_f="${PWD}/livecd.${PROJECT}.installer.squashfs"
create_squashfs "$OVERLAY_ROOT/" ${squashfs_f} (cd "$OVERLAY_ROOT/" &&
mksquashfs . ${squashfs_f} \
-no-progress -xattrs -comp xz )

Loading…
Cancel
Save