summaryrefslogtreecommitdiff
path: root/auto
diff options
context:
space:
mode:
authorAndreas Loibl <andreas@andreas-loibl.de>2010-12-13 11:05:06 +0100
committerAndreas Loibl <andreas@andreas-loibl.de>2010-12-13 11:05:06 +0100
commitc2215b0188cef393bdb0909d1f43cb3ed783685f (patch)
tree32763cf22ea05855321165e5860989ab76183dc1 /auto
parent14003f446f4190530fe7274fb20ad74f5139075f (diff)
downloadkanotix-c2215b0188cef393bdb0909d1f43cb3ed783685f.zip
kanotix-c2215b0188cef393bdb0909d1f43cb3ed783685f.tar.gz
applied changes from Kano
Diffstat (limited to 'auto')
-rwxr-xr-xauto/clean3
-rwxr-xr-xauto/config7
-rwxr-xr-xauto/kanotix1
3 files changed, 4 insertions, 7 deletions
diff --git a/auto/clean b/auto/clean
index dfd7de9..9f7f66f 100755
--- a/auto/clean
+++ b/auto/clean
@@ -56,5 +56,4 @@ do
shift
done
-exit 1
-
+exit 1
diff --git a/auto/config b/auto/config
index 10a58c7..8e0bbdd 100755
--- a/auto/config
+++ b/auto/config
@@ -17,12 +17,12 @@ lb config noauto \
--iso-publisher kanotix.com \
--chroot-filesystem squashfs \
--debian-installer false \
- --apt aptitude \
+ --apt apt \
--apt-recommends false \
- --bootappend-live 'splash utc=no timezone=Europe/Berlin locales=de keyboard-layouts=de keyboard-variant=nodeadkeys' \
+ --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" \
+ --repositories "live.debian.net acritox excalibur hellfire wine-ppa" \
--security true \
--checksums md5 \
--bootloader syslinux \
@@ -65,4 +65,3 @@ grep -oe '^[^ #]*' scripts.urls | wget -i- -N -q -P config/chroot_local-includes
chmod 755 config/chroot_local-includes/usr/local/bin/*.sh
exit 1
-
diff --git a/auto/kanotix b/auto/kanotix
index c99757b..32ebbb5 100755
--- a/auto/kanotix
+++ b/auto/kanotix
@@ -73,4 +73,3 @@ done
set -- "${args[@]}"
write_kanotix_config
-