rev 8049 - in people/fabo/live-helper/kde4live-iso-sid-i386/config: . chroot_local-hooks chroot_local-includes/root/localrepo chroot_local-packageslists
Fathi Boudra
fboudra-guest at alioth.debian.org
Thu Nov 22 19:26:13 UTC 2007
Author: fboudra-guest
Date: 2007-11-22 19:26:13 +0000 (Thu, 22 Nov 2007)
New Revision: 8049
Added:
people/fabo/live-helper/kde4live-iso-sid-i386/config/chroot_local-packageslists/kde4
Removed:
people/fabo/live-helper/kde4live-iso-sid-i386/config/chroot_local-includes/root/localrepo/aufs-modules-2.6.22-3-486_2.6.22+0+20070924-6_i386.deb
people/fabo/live-helper/kde4live-iso-sid-i386/config/chroot_local-includes/root/localrepo/live-initramfs_1.110.4-1_all.deb
people/fabo/live-helper/kde4live-iso-sid-i386/config/chroot_local-includes/root/localrepo/squashfs-modules-2.6.22-3-486_2.6.22+3.2r2-6_i386.deb
people/fabo/live-helper/kde4live-iso-sid-i386/config/chroot_local-includes/root/localrepo/unionfs-modules-2.6.22-3-486_2.6.22+1.4+debian-6_i386.deb
Modified:
people/fabo/live-helper/kde4live-iso-sid-i386/config/binary
people/fabo/live-helper/kde4live-iso-sid-i386/config/bootstrap
people/fabo/live-helper/kde4live-iso-sid-i386/config/chroot
people/fabo/live-helper/kde4live-iso-sid-i386/config/chroot_local-hooks/01-install_extra_package.sh
people/fabo/live-helper/kde4live-iso-sid-i386/config/common
Log:
* Update kde4 live config.
Modified: people/fabo/live-helper/kde4live-iso-sid-i386/config/binary
===================================================================
--- people/fabo/live-helper/kde4live-iso-sid-i386/config/binary 2007-11-22 18:27:52 UTC (rev 8048)
+++ people/fabo/live-helper/kde4live-iso-sid-i386/config/binary 2007-11-22 19:26:13 UTC (rev 8049)
@@ -1,5 +1,9 @@
# config/binary - options for live-helper(7), binary stage
+# $LH_BINARY_FILESYSTEM: set image filesystem
+# (Default: fat16)
+LH_BINARY_FILESYSTEM="fat16"
+
# $LH_BINARY_IMAGES: set image type
# (Default: iso)
LH_BINARY_IMAGES="iso"
@@ -20,6 +24,10 @@
# (Default: syslinux)
LH_BOOTLOADER="syslinux"
+# $LH_CHECKSUMS: set checksums
+# (Default: enabled)
+LH_CHECKSUMS="enabled"
+
# ${LH_CHROOT_BUILD: control if we build binary images chrooted
# (Default: enabled)
# DO NEVER, *NEVER*, *N*E*V*E*R* SET THIS OPTION to disabled.
@@ -50,8 +58,8 @@
LH_ISO_APPLICATION="Debian Live"
# $LH_ISO_PREPARER: set iso preparer
-# (Default: live-helper 1.0~a34; http://packages.qa.debian.org/live-helper)
-LH_ISO_PREPARER="live-helper 1.0~a34; http://packages.qa.debian.org/live-helper"
+# (Default: live-helper 1.0~a37; http://packages.qa.debian.org/live-helper)
+LH_ISO_PREPARER="live-helper 1.0~a37; http://packages.qa.debian.org/live-helper"
# $LH_ISO_PUBLISHER: set iso preparer
# (Default: Debian Live project; http://debian-live.alioth.debian.org/; debian-live-devel at lists.alioth.debian.org)
@@ -65,27 +73,43 @@
# (Default: memtest86+)
LH_MEMTEST="memtest86+"
-# $LH_NET_FILESYSTEM: set netboot filesystem
+# $LH_NET_ROOT_FILESYSTEM: set netboot filesystem
# (Default: nfs)
-LH_NET_FILESYSTEM="nfs"
+LH_NET_ROOT_FILESYSTEM="nfs"
-# $LH_NET_MOUNTOPTIONS: set nfsopts
+# $LH_NET_ROOT_MOUNTOPTIONS: set nfsopts
# (Default: empty)
-LH_NET_MOUNTOPTIONS=""
+LH_NET_ROOT_MOUNTOPTIONS=""
-# $LH_NET_PATH: set netboot server directory
+# $LH_NET_ROOT_PATH: set netboot server directory
# (Default: /srv/debian-live)
-LH_NET_PATH="/srv/debian-live"
+LH_NET_ROOT_PATH="/srv/debian-live"
-# $LH_NET_SERVER: set netboot server address
+# $LH_NET_ROOT_SERVER: set netboot server address
# (Default: 192.168.1.1)
-LH_NET_SERVER="192.168.1.1"
+LH_NET_ROOT_SERVER="192.168.1.1"
+# $LH_NET_COW_FILESYSTEM: set net client cow filesystem
+# (Default: nfs)
+LH_NET_COW_FILESYSTEM="nfs"
+
+# $LH_NET_COW_MOUNTOPTIONS: set cow mount options
+# (Default: empty)
+LH_NET_COW_MOUNTOPTIONS=""
+
+# $LH_NET_COW_PATH: set cow directory
+# (Default: )
+LH_NET_COW_PATH=""
+
+# $LH_NET_COW_SERVER: set cow server
+# (Default: )
+LH_NET_COW_SERVER=""
+
# $LH_SYSLINUX_SPLASH: set custom syslinux splash
# (Default: empty)
LH_SYSLINUX_SPLASH=""
-# $LH_SYSLINUX_TIMEOUT: set custom syslinux timeout
+# $LH_SYSLINUX_TIMEOUT: set custom syslinux timeout in seconds
# (Default: 0)
LH_SYSLINUX_TIMEOUT="0"
Modified: people/fabo/live-helper/kde4live-iso-sid-i386/config/bootstrap
===================================================================
--- people/fabo/live-helper/kde4live-iso-sid-i386/config/bootstrap 2007-11-22 18:27:52 UTC (rev 8048)
+++ people/fabo/live-helper/kde4live-iso-sid-i386/config/bootstrap 2007-11-22 19:26:13 UTC (rev 8049)
@@ -17,19 +17,19 @@
LH_BOOTSTRAP_EXCLUDE=""
# $LH_BOOTSTRAP_FLAVOUR: select flavour to use
-# (Default: standard)
-LH_BOOTSTRAP_FLAVOUR="standard"
+# (Default: )
+LH_BOOTSTRAP_FLAVOUR=""
# $LH_BOOTSTRAP_KEYRING: set distribution keyring
# (Default: empty)
LH_BOOTSTRAP_KEYRING=""
# $LH_DISTRIBUTION: select distribution to use
-# (Default: sid)
+# (Default: lenny)
LH_DISTRIBUTION="sid"
# $LH_MIRROR_BOOTSTRAP: set mirror to fetch packages from
-# (Default: http://ftp.de.debian.org/debian/)
+# (Default: http://ftp.debian.org/debian/)
LH_MIRROR_BOOTSTRAP="http://ftp.de.debian.org/debian/"
# $LH_MIRROR_BOOTSTRAP_SECURITY: set security mirror to fetch packages from
@@ -37,7 +37,7 @@
LH_MIRROR_BOOTSTRAP_SECURITY="http://security.debian.org/"
# $LH_MIRROR_BINARY: set mirror which ends up in the image
-# (Default: http://ftp.de.debian.org/debian/)
+# (Default: http://ftp.debian.org/debian/)
LH_MIRROR_BINARY="http://ftp.de.debian.org/debian/"
# $LH_MIRROR_BINARY_SECURITY: set security mirror which ends up in the image
@@ -45,5 +45,5 @@
LH_MIRROR_BINARY_SECURITY="http://security.debian.org/"
# $LH_SECTIONS: select section(s) to use
-# (Default: main contrib non-free)
+# (Default: main)
LH_SECTIONS="main contrib non-free"
Modified: people/fabo/live-helper/kde4live-iso-sid-i386/config/chroot
===================================================================
--- people/fabo/live-helper/kde4live-iso-sid-i386/config/chroot 2007-11-22 18:27:52 UTC (rev 8048)
+++ people/fabo/live-helper/kde4live-iso-sid-i386/config/chroot 2007-11-22 19:26:13 UTC (rev 8049)
@@ -5,8 +5,8 @@
LH_CHROOT_FILESYSTEM="squashfs"
# $LH_UNION_FILESYSTEM: set union filesystem
-# (Default: unionfs)
-LH_UNION_FILESYSTEM="unionfs"
+# (Default: aufs)
+LH_UNION_FILESYSTEM="aufs"
# $LH_EXPOSED_ROOT: expose root as read only
# (Default: disabled)
@@ -37,12 +37,12 @@
LH_LINUX_PACKAGES="linux-image-2.6 ${LH_UNION_FILESYSTEM}-modules-2.6 squashfs-modules-2.6"
# $LH_PACKAGES: set packages to install
-# (Default: openssh-server xdebconfigurator)
-LH_PACKAGES="openssh-server xdebconfigurator"
+# (Default: empty)
+LH_PACKAGES=""
# $LH_PACKAGES_LISTS: set package list to install
-# (Default: standard-x11)
-LH_PACKAGES_LISTS="standard-x11"
+# (Default: standard)
+LH_PACKAGES_LISTS="standard"
# $LH_TASKS: set tasks to install
# (Default: empty)
Modified: people/fabo/live-helper/kde4live-iso-sid-i386/config/chroot_local-hooks/01-install_extra_package.sh
===================================================================
--- people/fabo/live-helper/kde4live-iso-sid-i386/config/chroot_local-hooks/01-install_extra_package.sh 2007-11-22 18:27:52 UTC (rev 8048)
+++ people/fabo/live-helper/kde4live-iso-sid-i386/config/chroot_local-hooks/01-install_extra_package.sh 2007-11-22 19:26:13 UTC (rev 8049)
@@ -24,11 +24,6 @@
apt-get update
echo "I: install extra package"
-#apt-get install --yes linux-image-2.6.22-2-686
-#apt-get install --yes unionfs-modules-2.6.22-2-686
-#apt-get install --yes aufs-modules-2.6.22-2-686
-#apt-get install --yes squashfs-modules-2.6.22-2-686
-#apt-get install --yes live-initramfs
# kde4 packages list
@@ -180,12 +175,6 @@
apt-get install --yes desktop-base
-#dpkg -i --force-all ${LOCALREPO}/linux-image-2.6.22-3-486_2.6.22-5_i386.deb
-dpkg -i --force-all ${LOCALREPO}/unionfs-modules-2.6.22-3-486_2.6.22+1.4+debian-6_i386.deb
-#dpkg -i --force-all ${LOCALREPO}/aufs-modules-2.6.22-3-486_2.6.22+0+20070924-6_i386.deb
-dpkg -i --force-all ${LOCALREPO}/squashfs-modules-2.6.22-3-486_2.6.22+3.2r2-6_i386.deb
-dpkg -i --force-all ${LOCALREPO}/live-initramfs_1.110.4-1_all.deb
-
echo "I: remove extra package"
#apt-get remove --yes --purge \
# dpkg-dev \
Deleted: people/fabo/live-helper/kde4live-iso-sid-i386/config/chroot_local-includes/root/localrepo/aufs-modules-2.6.22-3-486_2.6.22+0+20070924-6_i386.deb
Deleted: people/fabo/live-helper/kde4live-iso-sid-i386/config/chroot_local-includes/root/localrepo/live-initramfs_1.110.4-1_all.deb
Deleted: people/fabo/live-helper/kde4live-iso-sid-i386/config/chroot_local-includes/root/localrepo/squashfs-modules-2.6.22-3-486_2.6.22+3.2r2-6_i386.deb
Deleted: people/fabo/live-helper/kde4live-iso-sid-i386/config/chroot_local-includes/root/localrepo/unionfs-modules-2.6.22-3-486_2.6.22+1.4+debian-6_i386.deb
Added: people/fabo/live-helper/kde4live-iso-sid-i386/config/chroot_local-packageslists/kde4
===================================================================
--- people/fabo/live-helper/kde4live-iso-sid-i386/config/chroot_local-packageslists/kde4 (rev 0)
+++ people/fabo/live-helper/kde4live-iso-sid-i386/config/chroot_local-packageslists/kde4 2007-11-22 19:26:13 UTC (rev 8049)
@@ -0,0 +1,4 @@
+#<include> standard-x11
+
+xdebconfigurator
+
Modified: people/fabo/live-helper/kde4live-iso-sid-i386/config/common
===================================================================
--- people/fabo/live-helper/kde4live-iso-sid-i386/config/common 2007-11-22 18:27:52 UTC (rev 8048)
+++ people/fabo/live-helper/kde4live-iso-sid-i386/config/common 2007-11-22 19:26:13 UTC (rev 8049)
@@ -22,7 +22,7 @@
# $LH_APT_RECOMMENDS: set apt/aptitude recommends
# (Default: enabled)
-LH_APT_RECOMMENDS="enabled"
+LH_APT_RECOMMENDS="disabled"
# $LH_APT_SECURE: set apt/aptitude security
# (Default: enabled)
@@ -64,6 +64,10 @@
# (Default: auto)
LH_INITRAMFS="auto"
+# $LH_FDISK: set fdisk program
+# (Default: autodetected)
+LH_FDISK="fdisk"
+
# $LH_LOSETUP: set losetup program
# (Default: autodetected)
LH_LOSETUP="losetup"
@@ -76,6 +80,10 @@
# (Default: empty)
#LH_ROOT_COMMAND="sudo"
+# $LH_USE_FAKEROOT: use fakeroot/fakechroot
+# (Default: disabled)
+LH_USE_FAKEROOT="disabled"
+
# $LH_TASKSEL: set tasksel program
# (Default: aptitude)
LH_TASKSEL="aptitude"
More information about the pkg-kde-commits
mailing list