Some workarounds for NixOS.
This commit is contained in:
parent
3be7844f02
commit
34a0c40550
@ -28,6 +28,7 @@ OPTIONS:
|
|||||||
-e, --enter Enters chroot enviroment.
|
-e, --enter Enters chroot enviroment.
|
||||||
-h, --help Displays this help message.
|
-h, --help Displays this help message.
|
||||||
--remount-run Remount /run in chroot enviroment.
|
--remount-run Remount /run in chroot enviroment.
|
||||||
|
--mount-runtime-only Mount XDG_RUNTIME_DIR to chroot enviroment.
|
||||||
|
|
||||||
EOF
|
EOF
|
||||||
}
|
}
|
||||||
@ -69,7 +70,7 @@ case $1 in
|
|||||||
mount -R /tmp $CHROOT/tmp
|
mount -R /tmp $CHROOT/tmp
|
||||||
mount -R /sys $CHROOT/sys
|
mount -R /sys $CHROOT/sys
|
||||||
mount -R /dev $CHROOT/dev
|
mount -R /dev $CHROOT/dev
|
||||||
mount -R /run $CHROOT/run
|
[[ $MOUNT_RUN = "yes" ]] && mount -R /run $CHROOT/run
|
||||||
mount --make-rslave $CHROOT/dev
|
mount --make-rslave $CHROOT/dev
|
||||||
mount --make-rslave $CHROOT/sys
|
mount --make-rslave $CHROOT/sys
|
||||||
mkdir -p $CHROOT/var/lib/dbus
|
mkdir -p $CHROOT/var/lib/dbus
|
||||||
@ -79,7 +80,7 @@ case $1 in
|
|||||||
mount -R /boot $CHROOT/boot
|
mount -R /boot $CHROOT/boot
|
||||||
cp /usr/local/share/archbox/chroot_setup.bash $CHROOT/chroot_setup
|
cp /usr/local/share/archbox/chroot_setup.bash $CHROOT/chroot_setup
|
||||||
echo $USER > /tmp/archbox_user
|
echo $USER > /tmp/archbox_user
|
||||||
chroot $CHROOT /bin/bash -c "/bin/sh /chroot_setup"
|
chroot $CHROOT /bin/bash -c "/chroot_setup"
|
||||||
;;
|
;;
|
||||||
-e|--enter)
|
-e|--enter)
|
||||||
storeenv
|
storeenv
|
||||||
@ -89,6 +90,9 @@ case $1 in
|
|||||||
--remount-run)
|
--remount-run)
|
||||||
$PRIV /usr/local/share/archbox/bin/remount_run
|
$PRIV /usr/local/share/archbox/bin/remount_run
|
||||||
;;
|
;;
|
||||||
|
--mount-runtime-only)
|
||||||
|
$PRIV /usr/local/share/archbox/bin/remount_run runtimeonly
|
||||||
|
;;
|
||||||
-h|--help)
|
-h|--help)
|
||||||
help_text
|
help_text
|
||||||
;;
|
;;
|
||||||
|
@ -2,6 +2,7 @@ USER="lemniskett"
|
|||||||
PRIV="sudo"
|
PRIV="sudo"
|
||||||
INSTALL_PATH="/var/archlinux"
|
INSTALL_PATH="/var/archlinux"
|
||||||
CHROOT="$INSTALL_PATH/root.x86_64"
|
CHROOT="$INSTALL_PATH/root.x86_64"
|
||||||
|
MOUNT_RUN="yes"
|
||||||
|
|
||||||
# Put your desired enviroment variable here, for example
|
# Put your desired enviroment variable here, for example
|
||||||
# ENV_VAR="HOME=/var/home/lemniskett"
|
# ENV_VAR="HOME=/var/home/lemniskett"
|
||||||
|
@ -11,7 +11,7 @@ case $1 in
|
|||||||
mount --make-rslave $CHROOT/sys
|
mount --make-rslave $CHROOT/sys
|
||||||
mount -R /dev $CHROOT/dev
|
mount -R /dev $CHROOT/dev
|
||||||
mount --make-rslave $CHROOT/dev
|
mount --make-rslave $CHROOT/dev
|
||||||
mount -R /run $CHROOT/run
|
[[ $MOUNT_RUN = "yes" ]] && mount -R /run $CHROOT/run
|
||||||
mount -R /lib/modules $CHROOT/lib/modules
|
mount -R /lib/modules $CHROOT/lib/modules
|
||||||
mount -R /boot $CHROOT/boot
|
mount -R /boot $CHROOT/boot
|
||||||
mount -R /var/lib/dbus $CHROOT/var/lib/dbus
|
mount -R /var/lib/dbus $CHROOT/var/lib/dbus
|
||||||
@ -25,7 +25,7 @@ case $1 in
|
|||||||
umount -R $CHROOT/tmp
|
umount -R $CHROOT/tmp
|
||||||
umount -R $CHROOT/sys
|
umount -R $CHROOT/sys
|
||||||
umount -R $CHROOT/dev
|
umount -R $CHROOT/dev
|
||||||
umount -R $CHROOT/run
|
[[ $MOUNT_RUN = "yes" ]] && umount -R $CHROOT/run
|
||||||
umount -R $CHROOT/lib/modules
|
umount -R $CHROOT/lib/modules
|
||||||
umount -R $CHROOT/boot
|
umount -R $CHROOT/boot
|
||||||
umount -R $CHROOT/var/lib/dbus
|
umount -R $CHROOT/var/lib/dbus
|
||||||
|
@ -9,6 +9,7 @@ msg(){
|
|||||||
echo "$(tput bold)$(tput setaf 2)==> $@ $(tput sgr0)"
|
echo "$(tput bold)$(tput setaf 2)==> $@ $(tput sgr0)"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
PATH=/usr/bin
|
||||||
msg "Initializing pacman keyrings..."
|
msg "Initializing pacman keyrings..."
|
||||||
pacman-key --init
|
pacman-key --init
|
||||||
pacman-key --populate archlinux
|
pacman-key --populate archlinux
|
||||||
|
@ -6,9 +6,16 @@ case $1 in
|
|||||||
killxdg)
|
killxdg)
|
||||||
umount -l $CHROOT/run
|
umount -l $CHROOT/run
|
||||||
fuser -km $(cat /tmp/archbox_xdg_runtime_dir)
|
fuser -km $(cat /tmp/archbox_xdg_runtime_dir)
|
||||||
|
exit $?
|
||||||
|
;;
|
||||||
|
runtimeonly)
|
||||||
|
mkdir -p $CHROOT/$(cat /tmp/archbox_xdg_runtime_dir)
|
||||||
|
mount --rbind $(cat /tmp/archbox_xdg_runtime_dir) $CHROOT/$(cat /tmp/archbox_xdg_runtime_dir)
|
||||||
|
exit $?
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
umount -l $CHROOT/run
|
umount -l $CHROOT/run
|
||||||
mount --rbind /run $CHROOT/run
|
mount --rbind /run $CHROOT/run
|
||||||
|
exit $?
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
Loading…
Reference in New Issue
Block a user