diff options
| author | Daniel Baumann <daniel@debian.org> | 2011-06-11 16:14:35 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-06-11 16:14:35 +0200 |
| commit | 65b7eb99f87c12741b1d6bb7640d8fdb7ad4a14f (patch) | |
| tree | 25c30d03f71605e1813c033207ecd6bf9788e035 | |
| parent | 14a3d468dc42fe6088e18dc9deca7fbff557fb97 (diff) | |
| download | vyos-live-build-65b7eb99f87c12741b1d6bb7640d8fdb7ad4a14f.tar.gz vyos-live-build-65b7eb99f87c12741b1d6bb7640d8fdb7ad4a14f.zip | |
Updating and simplyfing conditionals in package lists.
| -rw-r--r-- | lists/gnome | 2 | ||||
| -rw-r--r-- | lists/rescue | 5 | ||||
| -rw-r--r-- | lists/standard | 4 | ||||
| -rw-r--r-- | lists/standard-x11 | 5 |
4 files changed, 6 insertions, 10 deletions
diff --git a/lists/gnome b/lists/gnome index 4686f8b6a..fc878b1bb 100644 --- a/lists/gnome +++ b/lists/gnome @@ -3,7 +3,7 @@ #include <gnome-core> gnome-desktop-environment gnome-screensaver gnome-themes-extras -#if MODE debian +#nif MODE ubuntu system-config-printer #endif #if MODE ubuntu diff --git a/lists/rescue b/lists/rescue index bb793f38e..ec1d86225 100644 --- a/lists/rescue +++ b/lists/rescue @@ -33,9 +33,7 @@ aview mc nano-tiny mg vim wdiff hexedit nvi tweak # Harddisk dvd+rw-tools genisoimage sdparm hdparm blktool parted partimage secure-delete scsitools smartmontools testdisk wodim wipe hddtemp bonnie++ par2 dvd+rw-tools -#if DISTRIBUTION squeeze wheezy sid fsarchiver -#endif # for /usr/bin/summer: chiark-utils-bin @@ -155,9 +153,6 @@ cutter iproute iproute-doc iputils-tracepath -#if DISTRIBUTION lenny -mrt -#endif mtr-tiny tcptraceroute traceroute diff --git a/lists/standard b/lists/standard index 440ac8e29..e63631a7d 100644 --- a/lists/standard +++ b/lists/standard @@ -4,11 +4,9 @@ console-setup console-common kbd - -#if MODE emdebian debian ubuntu +#nif MODE progress locales #endif - #if MODE progress locales-all #endif diff --git a/lists/standard-x11 b/lists/standard-x11 index 9729b853d..042b98624 100644 --- a/lists/standard-x11 +++ b/lists/standard-x11 @@ -2,6 +2,9 @@ #include <standard> -xorg menu +xorg +#nif MODE progress +menu +#endif alsa-base alsa-utils keyboard-configuration |