From: stack Date: Wed, 13 Feb 2013 15:53:30 +0000 (+0100) Subject: added chroot contrib nonfree and flashplugin-nonfree X-Git-Url: https://v.licheni.net/stack/code/debianlive.git/commitdiff_plain/c426f90ca4c25b443cd5db04064d5179885f7e74?ds=sidebyside added chroot contrib nonfree and flashplugin-nonfree --- diff --git a/minimal/.gitignore b/minimal/.gitignore new file mode 100644 index 0000000..3f88dfa --- /dev/null +++ b/minimal/.gitignore @@ -0,0 +1,31 @@ +binary/ +binary*.iso +binary*.img +binary*.tar* +binary*.contents +binary*.packages +binary*.zsync + +.build/ +build.log + +cache/ + +chroot/ +chroot.packages.* + +config/binary +config/bootstrap +config/chroot +config/common +config/source + +config/control + +source/ +source*.iso +source*.img +source*.tar* +source*.contents +source*.packages +source*.zsync diff --git a/xfce-desktop/.gitignore b/xfce-desktop/.gitignore new file mode 100644 index 0000000..3f88dfa --- /dev/null +++ b/xfce-desktop/.gitignore @@ -0,0 +1,31 @@ +binary/ +binary*.iso +binary*.img +binary*.tar* +binary*.contents +binary*.packages +binary*.zsync + +.build/ +build.log + +cache/ + +chroot/ +chroot.packages.* + +config/binary +config/bootstrap +config/chroot +config/common +config/source + +config/control + +source/ +source*.iso +source*.img +source*.tar* +source*.contents +source*.packages +source*.zsync diff --git a/xfce-desktop/auto/config b/xfce-desktop/auto/config index 03588e3..307121d 100755 --- a/xfce-desktop/auto/config +++ b/xfce-desktop/auto/config @@ -6,12 +6,10 @@ -a i386 \ -b hdd \ -d sid \ - --linux-flavours 686-pae \ + --linux-flavours 686 \ --mode debian \ --debian-installer live \ --debian-installer-gui true \ - --bootstrap cdebootstrap \ - --cdebootstrap-options "--flavour=minimal" \ --bootappend-live "\ boot=live \ config \ @@ -22,8 +20,8 @@ persistence \ live-config.locales=it_IT live-config.timezone=Europe/Rome live-config.keyboard-layouts=it \ " \ - --apt-indices false --archive-areas "main contrib non-free" \ - --apt-recommends false \ + --archive-areas "main contrib non-free" \ + --apt-recommends true \ --linux-packages linux-image-3.7-trunk \ --mirror-bootstrap "${mirror}" \ --mirror-binary "${mirror}" \ diff --git a/xfce-desktop/config/archives/experimental.list.chroot b/xfce-desktop/config/archives/experimental.list.chroot index 88aba8e..86f5215 100644 --- a/xfce-desktop/config/archives/experimental.list.chroot +++ b/xfce-desktop/config/archives/experimental.list.chroot @@ -1 +1 @@ -deb http://ftp.debian.org/debian/ experimental main +deb http://ftp.debian.org/debian/ experimental main contrib non-free diff --git a/xfce-desktop/config/archives/wheezy.list.chroot b/xfce-desktop/config/archives/wheezy.list.chroot index 7d667ae..8feb4ed 100644 --- a/xfce-desktop/config/archives/wheezy.list.chroot +++ b/xfce-desktop/config/archives/wheezy.list.chroot @@ -1 +1 @@ -deb http://ftp.debian.org/debian/ wheezy main +deb http://ftp.debian.org/debian/ wheezy main contrib non-free diff --git a/xfce-desktop/config/package-lists/desktop.list.chroot b/xfce-desktop/config/package-lists/desktop.list.chroot index f221832..eff4711 100644 --- a/xfce-desktop/config/package-lists/desktop.list.chroot +++ b/xfce-desktop/config/package-lists/desktop.list.chroot @@ -3,6 +3,8 @@ task-laptop task-print-server task-ssh-server +flasplugin-nonfree + #nif DISTRIBUTION wheezy plymouth plymouth-drm plymouth-x11 #endif