QubesOS/qubes-linux-utils
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove busybox as it is not provided in RHEL7 anymore

Browse Source
This commit is contained in:
Frédéric Pierret 2018-02-21 19:52:56 +01:00
parent d1ce12f610
commit e3179e066c
No known key found for this signature in database
GPG Key ID: 1DABC232BE02201E
2 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dracut/simple/init.sh
View File

@ -10,7 +10,7 @@ if [ -e /dev/mapper/dmroot ] ; then
echo "Qubes: FATAL error: /dev/mapper/dmroot already exists?!" echo "Qubes: FATAL error: /dev/mapper/dmroot already exists?!"
fi fi
modprobe xenblk || modprobe xen-blkfront || echo "Qubes: Cannot load Xen Block Frontend..." /sbin/modprobe xenblk || /sbin/modprobe xen-blkfront || echo "Qubes: Cannot load Xen Block Frontend..."
die() { die() {
echo "$@" >&2 echo "$@" >&2
@ -47,7 +47,7 @@ if [ `cat /sys/class/block/$ROOT_DEV/ro` = 1 ] ; then
if [ $VOLATILE_SIZE -lt $SWAP_SIZE ]; then if [ $VOLATILE_SIZE -lt $SWAP_SIZE ]; then
die "volatile.img smaller than 1GB, cannot continue" die "volatile.img smaller than 1GB, cannot continue"
fi fi
sfdisk -q --unit S /dev/xvdc >/dev/null <<EOF /sbin/sfdisk -q --unit S /dev/xvdc >/dev/null <<EOF
1,$SWAP_SIZE,S 1,$SWAP_SIZE,S
,,L ,,L
EOF EOF
@ -56,29 +56,29 @@ EOF
exit 1 exit 1
fi fi
while ! [ -e /dev/xvdc1 ]; do sleep 0.1; done while ! [ -e /dev/xvdc1 ]; do sleep 0.1; done
mkswap /dev/xvdc1 /sbin/mkswap /dev/xvdc1
while ! [ -e /dev/xvdc2 ]; do sleep 0.1; done while ! [ -e /dev/xvdc2 ]; do sleep 0.1; done
echo "0 `cat /sys/class/block/$ROOT_DEV/size` snapshot /dev/$ROOT_DEV /dev/xvdc2 N 16" | \ echo "0 `cat /sys/class/block/$ROOT_DEV/size` snapshot /dev/$ROOT_DEV /dev/xvdc2 N 16" | \
dmsetup create dmroot || { echo "Qubes: FATAL: cannot create dmroot!"; exit 1; } /sbin/dmsetup create dmroot || { echo "Qubes: FATAL: cannot create dmroot!"; exit 1; }
dmsetup mknodes dmroot /sbin/dmsetup mknodes dmroot
echo Qubes: done. echo Qubes: done.
else else
echo "Qubes: Doing R/W setup for TemplateVM..." echo "Qubes: Doing R/W setup for TemplateVM..."
while ! [ -e /dev/xvdc ]; do sleep 0.1; done while ! [ -e /dev/xvdc ]; do sleep 0.1; done
sfdisk -q --unit S /dev/xvdc >/dev/null <<EOF /sbin/sfdisk -q --unit S /dev/xvdc >/dev/null <<EOF
1,$SWAP_SIZE,S 1,$SWAP_SIZE,S
EOF EOF
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
die "Qubes: failed to setup partitions on volatile device" die "Qubes: failed to setup partitions on volatile device"
fi fi
while ! [ -e /dev/xvdc1 ]; do sleep 0.1; done while ! [ -e /dev/xvdc1 ]; do sleep 0.1; done
mkswap /dev/xvdc1 /sbin/mkswap /dev/xvdc1
ln -s ../$ROOT_DEV /dev/mapper/dmroot ln -s ../$ROOT_DEV /dev/mapper/dmroot
echo Qubes: done. echo Qubes: done.
fi fi
modprobe ext4 /sbin/modprobe ext4
mkdir -p /sysroot mkdir -p /sysroot
mount /dev/mapper/dmroot /sysroot -o ro mount /dev/mapper/dmroot /sysroot -o ro
@ -104,4 +104,4 @@ fi
umount /dev /sys /proc umount /dev /sys /proc
exec switch_root $NEWROOT /sbin/init exec /sbin/switch_root $NEWROOT /sbin/init

15
dracut/simple/module-setup.sh
View File

@ -5,13 +5,26 @@ check() {
} }
depends() { depends() {
echo busybox dm echo dm
return 0 return 0
} }
install() { install() {
inst $moddir/init.sh /init inst $moddir/init.sh /init
inst_multiple \ inst_multiple \
basename \
readlink \
uname \
grep \
kmod \
modprobe \
ln \
switch_root \
mount \
umount \
mkdir \
rmdir \
sleep \
sfdisk \ sfdisk \
mkswap mkswap
} }