diff options
| author | Andreas Loibl <andreas@andreas-loibl.de> | 2012-02-08 02:29:32 +0100 |
|---|---|---|
| committer | Andreas Loibl <andreas@andreas-loibl.de> | 2012-02-08 02:29:32 +0100 |
| commit | ffb14093b38eb64a73f978d0ae966c1cdf44013f (patch) | |
| tree | b484087a72c092f07c7e973c4e0a86e51b3fafad | |
| parent | 90df5fcb4a42cca29e705822a87b47a57d30fae8 (diff) | |
| download | kanotix-ffb14093b38eb64a73f978d0ae966c1cdf44013f.zip kanotix-ffb14093b38eb64a73f978d0ae966c1cdf44013f.tar.gz | |
imported patches from Kano
http://kanotix.com/files/kanotix-hellfire/kanotix-live-build-update.patch
* hellfire-extra repo
* enable backports by default
* small packagelists changes
| -rwxr-xr-x | auto/config | 7 | ||||
| -rw-r--r-- | config/lists/base | 2 | ||||
| -rw-r--r-- | config/lists/desktop | 3 | ||||
| -rw-r--r-- | config/repositories/hellfire | 4 |
4 files changed, 12 insertions, 4 deletions
diff --git a/auto/config b/auto/config index d6a8dd5..d442093 100755 --- a/auto/config +++ b/auto/config @@ -38,6 +38,7 @@ lb config noauto \ --mirror-binary ${MIRROR_BINARY} \ --mirror-binary-security ${MIRROR_BINARY_SECURITY} \ --binary-indices true \ + --backports true \ "${@}" # hostname and username are configured in config/chroot_local-includes/etc/live/config.conf @@ -53,14 +54,16 @@ lb config noauto \ case $LB_ARCHITECTURE in "amd64") lb config noauto \ - --linux-flavours generic + --linux-flavours generic \ + --linux-packages "linux-image-3.0.0-16 linux-headers-3.0.0-16" #--linux-packages "linux-image linux-headers" #--linux-flavours amd64 \ #--linux-packages "linux-image-2.6 linux-headers-2.6" ;; "i386") lb config noauto \ - --linux-flavours generic + --linux-flavours generic \ + --linux-packages "linux-image-3.0.0-16 linux-headers-3.0.0-16" #--linux-packages "linux-image linux-headers" #--linux-flavours 686-bigmem \ #--linux-packages "linux-image-2.6 linux-headers-2.6" diff --git a/config/lists/base b/config/lists/base index e6ab2f3..7fcfedf 100644 --- a/config/lists/base +++ b/config/lists/base @@ -75,7 +75,7 @@ openssh-client sshfs smbfs pppoeconf -nfs-common +#nfs-common ncpfs bluez-audio ethtool diff --git a/config/lists/desktop b/config/lists/desktop index 306b085..2c67a55 100644 --- a/config/lists/desktop +++ b/config/lists/desktop @@ -1,7 +1,8 @@ # Kanotix Desktop Packages List # java, plugins -sun-java6-plugin +#sun-java6-plugin +icedtea6-plugin # multimedia dvdauthor diff --git a/config/repositories/hellfire b/config/repositories/hellfire index 5ea3a89..de5a972 100644 --- a/config/repositories/hellfire +++ b/config/repositories/hellfire @@ -1,3 +1,7 @@ # Kanotix Hellfire deb http://kanotix.com/files/hellfire ./ deb-src http://kanotix.com/files/hellfire ./ + +# Kanotix Hellfire Extra +deb http://kanotix.com/files/hellfire.extra ./ +deb-src http://kanotix.com/files/hellfire.extra ./ |