diff options
author | Andreas Loibl <andreas@andreas-loibl.de> | 2011-09-14 23:54:58 +0200 |
---|---|---|
committer | Andreas Loibl <andreas@andreas-loibl.de> | 2011-09-14 23:59:02 +0200 |
commit | 2359d76bc28f0d72908924e891a5aa8af9d130ea (patch) | |
tree | 241b6c6018d8c266893f1bf76bc9b61b9b97e0f2 | |
parent | 14f39b67ae34f7f4ea10e68ba36e4ac624dc8930 (diff) | |
download | kanotix-2359d76bc28f0d72908924e891a5aa8af9d130ea.zip kanotix-2359d76bc28f0d72908924e891a5aa8af9d130ea.tar.gz |
use grub2-squeeze-backport
-rwxr-xr-x | auto/config | 2 | ||||
-rwxr-xr-x | config/chroot_local-hooks/03-distro | 1 | ||||
-rw-r--r-- | config/repositories/grub | 3 | ||||
-rw-r--r-- | config/repositories/grub.gpg | 30 |
4 files changed, 35 insertions, 1 deletions
diff --git a/auto/config b/auto/config index d21e7aa..7332025 100755 --- a/auto/config +++ b/auto/config @@ -24,7 +24,7 @@ lb config noauto \ --bootappend-live 'utc=no timezone=Europe/Berlin locales=de keyboard-layouts=de keyboard-variant=nodeadkeys splash' \ --distribution squeeze \ --archive-areas "main contrib non-free" \ - --repositories "live.debian.net acritox excalibur hellfire lo wine-ppa firefox" \ + --repositories "live.debian.net acritox excalibur hellfire lo wine-ppa firefox grub" \ --security true \ --checksums md5 \ --syslinux-timeout 5 \ diff --git a/config/chroot_local-hooks/03-distro b/config/chroot_local-hooks/03-distro index adab651..6fb7118 100755 --- a/config/chroot_local-hooks/03-distro +++ b/config/chroot_local-hooks/03-distro @@ -11,6 +11,7 @@ rsync -Ha --ignore-existing /usr/share/kanotix/profile/ /etc/skel/ perl -pi -e 's/^(GRUB_DISTRIBUTOR)=.*/\1=`[ "\$\(uname -m\)" = "x86_64" ] && echo Kanotix64 || echo Kanotix`/' /etc/default/grub perl -pi -e 's/.*(GRUB_DISABLE_LINUX_RECOVERY)=.*/\1="true"/' /etc/default/grub +perl -pi -e 's/.*(GRUB_DISABLE_RECOVERY)=.*/\1="true"/' /etc/default/grub perl -pi -e 's/^(GRUB_CMDLINE_LINUX_DEFAULT)=.*/\1="quiet splash"/' /etc/default/grub rm -f /etc/skel/Desktop/kanotix-irc.desktop.tmp diff --git a/config/repositories/grub b/config/repositories/grub new file mode 100644 index 0000000..7f84c01 --- /dev/null +++ b/config/repositories/grub @@ -0,0 +1,3 @@ +# Grub2 +deb http://kanotix.com/files/fix/grub2.squeeze ./ +deb-src http://kanotix.com/files/fix/grub2.squeeze ./ diff --git a/config/repositories/grub.gpg b/config/repositories/grub.gpg new file mode 100644 index 0000000..051af27 --- /dev/null +++ b/config/repositories/grub.gpg @@ -0,0 +1,30 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.6 (GNU/Linux) + +mQGiBEbWErMRBACOPf61a+Of7/kfSx1djy8DEiyDa9ESx6nNnIaPy4agExu1XJdk +oWzVKqZlZuC8TEhjV+L8RpStBPdVxUuspASZtqEcJVF9viZtMzK2NTVR2bKtFNfj +OBRK3CAcHjhne0HCGPN7k2Tw2qW/jxucSdbw+0DKeRZBA1G4OS+0qWubbwCg1GVi +OXgXoeoHp9fAmRYKpfkLx3UD/2bLTanQ3vmdmYGgW6rCSTrackolYjUD9Qs5KPXT +jTC77Bti2SCJvO+aao4sl8QrkejmrtLmTGIQj3wWsQLk2KQwt593Xn9KZy6kokvQ +rkMcpqh/J5zxZF3xSLkIBXfZOsKeRj1U4MdGg25GeUG5k7xLUaaoqNWHZdPwJe0s +n7tJA/9WYaqHWcT/txpXkxg6HXA1ZadF86KxDV4uiccQMxDeURn0gmN51FSoexoI +EFxzLLeTvvqMLWIUGsv5Vn1aTYhoBOSw9XnO3o0a+G5Iwg9RPa2ovRLRJ94f8kgk +hDFL6ELroQPH522UNF8vNO8S+3ADWjPfTwjiVSs9a1aFwCV9mLQqS2Fub3RpeCAo +VGhvcmhhbW1lcikgPG5vcmVwbHlAa2Fub3RpeC5jb20+iGAEExECACACGwMGCwkI +BwMCBBUCCAMEFgIDAQIeAQIXgAUCSfSlhgAKCRDSDW5vauzFPRlAAJ97OIJp57Vk +qX0gsM3hBmkjWoSqrwCcDw/XKEp3BmxFpEa4JHIiyr9aQZ25Ag0ERtYStRAIALIx +U9baoSsUuNtyOTS9vGvy4uKo34/XMSSLMCAWKSBHXZ5p2fFRfmTymoZpjl8OLpeq +L/b9IyWbd0LnFLWT8pMXvNAoL6dwWermnmW0gONxb9zLBHcFfANoa6epcpG1NkWC +Wyujjcaf5i8wcUexsGNTrTQXZGq5KNtyRnscONfwB+tmH15YZgU3JwlnVlAV67Qo +zkktDqeyKGDNDkJJbEfIXIwQ0zMSGapzYoLpX1KtPqDjSX/Hzb56FN9mUX/qDtpJ +iKLSluuXbG9NwsBowfAyX4yJa3LkiABR4ZmqW8qSkV15tZRsJS+JyqP5ni5WZrcs +PmivpmIX0j52ytORtqMAAwYH/1dwmOJQyyZwiRsC09gnZjqBv+S/Yw3yFfjFjhaY +AqTQ0Whq5ptQLZBMQDHV7+VuEBghvPe6P+OoU3QorZ6HdHnwQkaU7z6olmRplYLj +mGgMGpIpzhpFNuBWmvYePvDTQWpe/Je6KL55kiGrGQCknnC4458DWEld0h0fbiDG +YWAR7F4dZ7CRHJgTjof9nOeQVnSfqYkXWkfbqAjDSrxZoyTr0dSYpKjgRwr3c6TM +hBSSiMYW6S0ZknA+hG5SKmoyBeVRCT6FDErYYfP3d7ZqpZ08DmTjrnB1H8Qj+Sda +26m9UqMdhmwpp2DPp3A5GmKqzbNRH5xnPGlOriotbnsvIauITwQYEQIADwUCRtYS +tQIbDAUJAeEzgAAKCRDSDW5vauzFPfaNAJ0bvj0+YPKUe45fdCiRRWPOSej0ZACf +XaCZ+2zAh156vgAAfkPqU5FHg/8= +=fxFL +-----END PGP PUBLIC KEY BLOCK----- |