Merge branch 'main' of http://68.233.46.81:3000/Peppermint_OS/bubbles
This commit is contained in:
commit
973ed41a3b
|
@ -16,10 +16,10 @@ echo "Running bootloader-config..."
|
||||||
|
|
||||||
if [ -d /sys/firmware/efi/efivars ]; then
|
if [ -d /sys/firmware/efi/efivars ]; then
|
||||||
echo " * Installing grub-efi (uefi)..."
|
echo " * Installing grub-efi (uefi)..."
|
||||||
DEBIAN_FRONTEND=noninteractive chroot $CHROOT apt-get -y install grub-efi-ia32
|
DEBIAN_FRONTEND=noninteractive chroot $CHROOT apt-get -y install grub-efi-ia32-bin
|
||||||
else
|
else
|
||||||
echo " * install grub... (bios)"
|
echo " * install grub... (bios)"
|
||||||
DEBIAN_FRONTEND=noninteractive chroot $CHROOT apt-get -y install grub-pc
|
DEBIAN_FRONTEND=noninteractive chroot $CHROOT apt-get -y install grub-pc-bin
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Re-enable os-prober:
|
# Re-enable os-prober:
|
||||||
|
|
|
@ -16,10 +16,10 @@ echo "Running bootloader-config..."
|
||||||
|
|
||||||
if [ -d /sys/firmware/efi/efivars ]; then
|
if [ -d /sys/firmware/efi/efivars ]; then
|
||||||
echo " * Installing grub-efi (uefi)..."
|
echo " * Installing grub-efi (uefi)..."
|
||||||
DEBIAN_FRONTEND=noninteractive chroot $CHROOT apt-get -y install grub-efi-amd64
|
DEBIAN_FRONTEND=noninteractive chroot $CHROOT apt-get -y install grub-efi-amd64-bin
|
||||||
else
|
else
|
||||||
echo " * install grub... (bios)"
|
echo " * install grub... (bios)"
|
||||||
DEBIAN_FRONTEND=noninteractive chroot $CHROOT apt-get -y install grub-pc
|
DEBIAN_FRONTEND=noninteractive chroot $CHROOT apt-get -y install grub-pc-bin
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Re-enable os-prober:
|
# Re-enable os-prober:
|
||||||
|
|
|
@ -16,10 +16,10 @@ echo "Running bootloader-config..."
|
||||||
|
|
||||||
if [ -d /sys/firmware/efi/efivars ]; then
|
if [ -d /sys/firmware/efi/efivars ]; then
|
||||||
echo " * Installing grub-efi (uefi)..."
|
echo " * Installing grub-efi (uefi)..."
|
||||||
DEBIAN_FRONTEND=noninteractive chroot $CHROOT apt-get -y install grub-efi-ia32
|
DEBIAN_FRONTEND=noninteractive chroot $CHROOT apt-get -y install grub-efi-ia32-bin
|
||||||
else
|
else
|
||||||
echo " * install grub... (bios)"
|
echo " * install grub... (bios)"
|
||||||
DEBIAN_FRONTEND=noninteractive chroot $CHROOT apt-get -y install grub-pc
|
DEBIAN_FRONTEND=noninteractive chroot $CHROOT apt-get -y install grub-pc-bin
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Re-enable os-prober:
|
# Re-enable os-prober:
|
||||||
|
|
|
@ -16,10 +16,10 @@ echo "Running bootloader-config..."
|
||||||
|
|
||||||
if [ -d /sys/firmware/efi/efivars ]; then
|
if [ -d /sys/firmware/efi/efivars ]; then
|
||||||
echo " * Installing grub-efi (uefi)..."
|
echo " * Installing grub-efi (uefi)..."
|
||||||
DEBIAN_FRONTEND=noninteractive chroot $CHROOT apt-get -y install grub-efi-amd64
|
DEBIAN_FRONTEND=noninteractive chroot $CHROOT apt-get -y install grub-efi-amd64-bin
|
||||||
else
|
else
|
||||||
echo " * install grub... (bios)"
|
echo " * install grub... (bios)"
|
||||||
DEBIAN_FRONTEND=noninteractive chroot $CHROOT apt-get -y install grub-pc
|
DEBIAN_FRONTEND=noninteractive chroot $CHROOT apt-get -y install grub-pc-bin
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Re-enable os-prober:
|
# Re-enable os-prober:
|
||||||
|
|
|
@ -19,7 +19,7 @@ close_on_unmount=1
|
||||||
focus_previous=0
|
focus_previous=0
|
||||||
side_pane_mode=places
|
side_pane_mode=places
|
||||||
view_mode=icon
|
view_mode=icon
|
||||||
show_hidden=1
|
show_hidden=0
|
||||||
sort=name;ascending;
|
sort=name;ascending;
|
||||||
toolbar=newtab;navigation;home;
|
toolbar=newtab;navigation;home;
|
||||||
show_statusbar=0
|
show_statusbar=0
|
||||||
|
|
|
@ -144,6 +144,7 @@ OPENBOX_LIST = ('openbox\n'
|
||||||
'lxpolkit\n'
|
'lxpolkit\n'
|
||||||
'peppermint-icon-themes\n'
|
'peppermint-icon-themes\n'
|
||||||
'marwaita-peppermint-gtk-theme\n'
|
'marwaita-peppermint-gtk-theme\n'
|
||||||
|
'numix-gtk-theme\n'
|
||||||
'xdg-user-dirs-gtk\n'
|
'xdg-user-dirs-gtk\n'
|
||||||
'cbatticon\n'
|
'cbatticon\n'
|
||||||
'dunst\n'
|
'dunst\n'
|
||||||
|
|
Loading…
Reference in New Issue