diff options
| -rwxr-xr-x | auto/config | 4 | ||||
| -rwxr-xr-x | auto/kanotix | 15 | ||||
| -rw-r--r-- | config/lists/acritox (renamed from config/chroot_local-packageslists/acritox) | 0 | ||||
| -rw-r--r-- | config/lists/base (renamed from config/chroot_local-packageslists/base) | 1 | ||||
| -rw-r--r-- | config/lists/base.amd64 (renamed from config/chroot_local-packageslists/base.amd64) | 0 | ||||
| -rw-r--r-- | config/lists/base.i386 (renamed from config/chroot_local-packageslists/base.i386) | 0 | ||||
| -rw-r--r-- | config/lists/firmware (renamed from config/chroot_local-packageslists/firmware) | 0 | ||||
| -rw-r--r-- | config/lists/kanotix-full (renamed from config/chroot_local-packageslists/kanotix-full) | 0 | ||||
| -rw-r--r-- | config/lists/kanotix-lite (renamed from config/chroot_local-packageslists/kanotix-lite) | 0 | ||||
| -rw-r--r-- | config/lists/kanotix-master (renamed from config/chroot_local-packageslists/kanotix-master) | 0 | ||||
| -rw-r--r-- | config/lists/kde (renamed from config/chroot_local-packageslists/kde) | 0 | ||||
| -rw-r--r-- | config/lists/office (renamed from config/chroot_local-packageslists/office) | 0 |
12 files changed, 4 insertions, 16 deletions
diff --git a/auto/config b/auto/config index 0b7ed72..008ef18 100755 --- a/auto/config +++ b/auto/config @@ -8,6 +8,9 @@ MIRROR_BOOTSTRAP="$MIRROR_CHROOT" . auto/kanotix +# preset default packages list +export LB_PACKAGES_LISTS="kanotix-master" + lb config noauto \ --iso-volume KANOTIX \ --iso-preparer kanotix.com \ @@ -33,7 +36,6 @@ lb config noauto \ --mirror-binary ${MIRROR_BINARY} \ --mirror-binary-security ${MIRROR_BINARY_SECURITY} \ --binary-indices true \ - --packages-lists "standard-x11" \ ${@} # hostname and username are configured in config/chroot_local-includes/etc/live/config.conf diff --git a/auto/kanotix b/auto/kanotix index c61e9cf..c99757b 100755 --- a/auto/kanotix +++ b/auto/kanotix @@ -7,7 +7,6 @@ usage() cat <<eof Additional Options for Kanotix: - [--kanotix-flavours FLAVOUR|"FLAVOURS"] [--include-nvidia true|false] [--tmpfs true|false] [--tmpfs-options OPTIONS] @@ -17,7 +16,6 @@ eof write_kanotix_config() { -[ -z "${LB_KANOTIX_FLAVOURS}" ] && LB_KANOTIX_FLAVOURS="kanotix-master" [ -z "${LB_KANOTIX_NVIDIA}" ] && LB_KANOTIX_NVIDIA="true" [ -z "${LB_KANOTIX_TMPFS}" ] && [ -d tmpfs ] && LB_KANOTIX_TMPFS="true" [ -z "${LB_KANOTIX_TMPFS}" ] && LB_KANOTIX_TMPFS="false" @@ -26,10 +24,6 @@ write_kanotix_config() cat >config/kanotix << EOF # config/kanotix - additional options for Kanotix -# \$LB_KANOTIX_FLAVOURS: select Kanotix-packageslists -# (Default: kanotix-master) -LB_KANOTIX_FLAVOURS="${LB_KANOTIX_FLAVOURS}" - # \$LB_KANOTIX_NVIDIA: include NVidia-Drivers into chroot # (Default: ${LB_KANOTIX_NVIDIA}) LB_KANOTIX_NVIDIA="${LB_KANOTIX_NVIDIA}" @@ -51,15 +45,6 @@ unset args; i=1 while [ "$1" ] do case "$1" in - --kanotix-flavour*) - LB_KANOTIX_FLAVOURS="$2" - shift - while [ "$2" -a "${2:0:1}" != "-" ] - do - LB_KANOTIX_FLAVOURS="$LB_KANOTIX_FLAVOURS $2" - shift - done - ;; --include-nvidia) LB_KANOTIX_NVIDIA="$2" shift diff --git a/config/chroot_local-packageslists/acritox b/config/lists/acritox index 28c0198..28c0198 100644 --- a/config/chroot_local-packageslists/acritox +++ b/config/lists/acritox diff --git a/config/chroot_local-packageslists/base b/config/lists/base index 6d46b8b..4c246cc 100644 --- a/config/chroot_local-packageslists/base +++ b/config/lists/base @@ -9,6 +9,7 @@ #endif #include <firmware> +#include <standard-x11> # office myspell-de-de diff --git a/config/chroot_local-packageslists/base.amd64 b/config/lists/base.amd64 index 30b5c74..30b5c74 100644 --- a/config/chroot_local-packageslists/base.amd64 +++ b/config/lists/base.amd64 diff --git a/config/chroot_local-packageslists/base.i386 b/config/lists/base.i386 index 9909de1..9909de1 100644 --- a/config/chroot_local-packageslists/base.i386 +++ b/config/lists/base.i386 diff --git a/config/chroot_local-packageslists/firmware b/config/lists/firmware index b14a864..b14a864 100644 --- a/config/chroot_local-packageslists/firmware +++ b/config/lists/firmware diff --git a/config/chroot_local-packageslists/kanotix-full b/config/lists/kanotix-full index 86e1e60..86e1e60 100644 --- a/config/chroot_local-packageslists/kanotix-full +++ b/config/lists/kanotix-full diff --git a/config/chroot_local-packageslists/kanotix-lite b/config/lists/kanotix-lite index 22f7bef..22f7bef 100644 --- a/config/chroot_local-packageslists/kanotix-lite +++ b/config/lists/kanotix-lite diff --git a/config/chroot_local-packageslists/kanotix-master b/config/lists/kanotix-master index 209c1ec..209c1ec 100644 --- a/config/chroot_local-packageslists/kanotix-master +++ b/config/lists/kanotix-master diff --git a/config/chroot_local-packageslists/kde b/config/lists/kde index e170fe0..e170fe0 100644 --- a/config/chroot_local-packageslists/kde +++ b/config/lists/kde diff --git a/config/chroot_local-packageslists/office b/config/lists/office index e998500..e998500 100644 --- a/config/chroot_local-packageslists/office +++ b/config/lists/office |