dmsquash-live-root: Remove obsolete osmin.img processing.
osmin.img is no longer used by anaconda or generated by livemedia-creator. livecd-creator will soon drop it as well. Removing this code will allow OverlayFS boots to proceed when osmin.img is present in the .iso image.master
parent
74f83fb9f3
commit
f7e924c577
|
@ -268,20 +268,6 @@ do_live_overlay() {
|
||||||
}
|
}
|
||||||
# end do_live_overlay()
|
# end do_live_overlay()
|
||||||
|
|
||||||
# we might have a genMinInstDelta delta file for anaconda to take advantage of
|
|
||||||
if [ -e /run/initramfs/live/${live_dir}/osmin.img ]; then
|
|
||||||
OSMINSQFS=/run/initramfs/live/${live_dir}/osmin.img
|
|
||||||
# decompress the delta data
|
|
||||||
dd if=$OSMINSQFS of=/run/initramfs/osmin.img 2> /dev/null
|
|
||||||
OSMIN_SQUASHED_LOOPDEV=$( losetup -f )
|
|
||||||
losetup -r $OSMIN_SQUASHED_LOOPDEV /run/initramfs/osmin.img
|
|
||||||
mkdir -m 0755 -p /run/initramfs/squashfs.osmin
|
|
||||||
mount -n -t squashfs -o ro $OSMIN_SQUASHED_LOOPDEV /run/initramfs/squashfs.osmin
|
|
||||||
OSMIN_LOOPDEV=$( losetup -f )
|
|
||||||
losetup -r $OSMIN_LOOPDEV /run/initramfs/squashfs.osmin/osmin
|
|
||||||
umount -l /run/initramfs/squashfs.osmin
|
|
||||||
fi
|
|
||||||
|
|
||||||
# we might have an embedded fs image on squashfs (compressed live)
|
# we might have an embedded fs image on squashfs (compressed live)
|
||||||
if [ -e /run/initramfs/live/${live_dir}/${squash_image} ]; then
|
if [ -e /run/initramfs/live/${live_dir}/${squash_image} ]; then
|
||||||
SQUASHED="/run/initramfs/live/${live_dir}/${squash_image}"
|
SQUASHED="/run/initramfs/live/${live_dir}/${squash_image}"
|
||||||
|
@ -370,12 +356,6 @@ if [ -n "$FSIMG" ]; then
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -b "$OSMIN_LOOPDEV" ]; then
|
|
||||||
# set up the devicemapper snapshot device, which will merge
|
|
||||||
# the normal live fs image, and the delta, into a minimzied fs image
|
|
||||||
echo "0 $sz snapshot $BASE_LOOPDEV $OSMIN_LOOPDEV P 8" | dmsetup create --readonly live-osimg-min
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -n "$reloadsysrootmountunit" ]; then
|
if [ -n "$reloadsysrootmountunit" ]; then
|
||||||
eval "$reloadsysrootmountunit"
|
eval "$reloadsysrootmountunit"
|
||||||
systemctl daemon-reload
|
systemctl daemon-reload
|
||||||
|
|
Loading…
Reference in New Issue