This commit is contained in:
simono41 2018-07-17 18:51:57 +02:00
parent 6c48085ba3
commit 8e4da0cd50

View file

@ -201,11 +201,11 @@ function usbsecret() {
function cron() { function cron() {
echo "cron-job snapshot" echo "cron-job snapshot"
mkdir -p ${mountpoint}/var/spool/cron/ mkdir -p ${mountpoint}/var/spool/cron/
if [ "y" == "${windualboot}" ]; then #if [ "y" == "${windualboot}" ]; then
echo -n "0 18 * * * /usr/bin/snapshot makeboot ROOT home opt var/cache/pacman/pkg " > ${mountpoint}/var/spool/cron/root # echo -n "0 18 * * * /usr/bin/snapshot makeboot ROOT home opt var/cache/pacman/pkg " > ${mountpoint}/var/spool/cron/root
else #else
echo -n "0 18 * * * /usr/bin/snapshot make ROOT home opt var/cache/pacman/pkg " > ${mountpoint}/var/spool/cron/root echo -n "0 18 * * * /usr/bin/snapshot make ROOT home opt var/cache/pacman/pkg " > ${mountpoint}/var/spool/cron/root
fi #fi
# custom-mounts # custom-mounts
for wort in ${mountsnaps} for wort in ${mountsnaps}
@ -1160,15 +1160,15 @@ then
grubinstall grubinstall
if [ "y" == "${windualboot}" ]; then #if [ "y" == "${windualboot}" ]; then
mkinitcpio -c /etc/mkinitcpio.conf -g /boot/initramfs-linux.img # mkinitcpio -c /etc/mkinitcpio.conf -g /boot/initramfs-linux.img
else #else
if [ "${version}" == "libre" ]; then if [ "${version}" == "libre" ]; then
arch-chroot ${mountpoint} mkinitcpio -p linux-libre arch-chroot ${mountpoint} mkinitcpio -p linux-libre
else else
arch-chroot ${mountpoint} mkinitcpio -P -c /etc/mkinitcpio.conf arch-chroot ${mountpoint} mkinitcpio -P -c /etc/mkinitcpio.conf
fi fi
fi #fi
echo "" echo ""
if [ "${boot}" == "grub" ] if [ "${boot}" == "grub" ]
then then
@ -1198,15 +1198,15 @@ elif [ "${Partition}" == "bios" ]; then
grubinstall grubinstall
if [ "y" == "${windualboot}" ]; then #if [ "y" == "${windualboot}" ]; then
mkinitcpio -c /etc/mkinitcpio.conf -g /boot/initramfs-linux.img # mkinitcpio -c /etc/mkinitcpio.conf -g /boot/initramfs-linux.img
else #else
if [ "${version}" == "libre" ]; then if [ "${version}" == "libre" ]; then
arch-chroot ${mountpoint} mkinitcpio -p linux-libre arch-chroot ${mountpoint} mkinitcpio -p linux-libre
else else
arch-chroot ${mountpoint} mkinitcpio -P linux -c /etc/mkinitcpio.conf arch-chroot ${mountpoint} mkinitcpio -P linux -c /etc/mkinitcpio.conf
fi fi
fi #fi
echo "" echo ""
arch-chroot ${mountpoint} grub-install --target=i386-pc --recheck ${device} arch-chroot ${mountpoint} grub-install --target=i386-pc --recheck ${device}
arch-chroot ${mountpoint} grub-mkconfig -o /boot/grub/grub.cfg arch-chroot ${mountpoint} grub-mkconfig -o /boot/grub/grub.cfg