[SCM] debian-live/config-webc branch, master, updated. 4f579e790ce4f2e373e6cb489dac3beefd9cd167

Kai Hendry hendry at iki.fi
Thu May 29 15:50:58 UTC 2008 

The following commit has been merged in the master branch:
commit 4f579e790ce4f2e373e6cb489dac3beefd9cd167
Author: Kai Hendry <hendry at iki.fi>
Date:   Thu May 29 16:50:53 2008 +0100

    Webc for the new webconverger-base 2.41 !
    
    A bug in mini/config/chroot_local-hooks/perms means one has to
    sudo chroot chroot /bin/bash
    and run `chown -R webc:webc ~webc` in the chroot! grrr

diff --git a/mini/config/binary b/mini/config/binary
index d09c196..5d64440 100644
--- a/mini/config/binary
+++ b/mini/config/binary
@@ -4,10 +4,6 @@
 # (Default: fat16)
 #LH_BINARY_FILESYSTEM="fat16"
 
-# $LH_BINARY_IMAGES: set image type
-# (Default: iso)
-#LH_BINARY_IMAGES="usb-hdd"
-
 # $LH_BINARY_INDICES: set apt/aptitude generic indices
 # (Default: enabled)
 #LH_BINARY_INDICES="enabled"
@@ -16,8 +12,12 @@
 # (Default: empty)
 LH_BOOTAPPEND_LIVE="quiet homepage=http://portal.webconverger.com/ nosudo splash vga=791"
 
+# $LH_BINARY_IMAGES: set image type
+# (Default: iso)
+#LH_BINARY_IMAGES="usb-hdd"
+
 # $LH_BOOTLOADER: set bootloader
-# (Default: syslinux)
+# (Default: syslinux) for LH_BINARY_IMAGES="usb-hdd"
 LH_BOOTLOADER="grub"
 
 # $LH_CHECKSUMS: set checksums
@@ -80,6 +80,7 @@ LH_ISO_VOLUME="Webconverger $(date +%Y%m%d-%H:%M)"
 # $LH_MEMTEST: set memtest
 # (Default: memtest86+)
 #LH_MEMTEST="memtest86+"
+LH_MEMTEST="disabled"
 
 # $LH_NET_ROOT_FILESYSTEM: set netboot filesystem
 # (Default: nfs)
diff --git a/mini/config/chroot_local-hooks/ipw2200.sh b/mini/config/chroot_local-hooks/ipw2200.sh
deleted file mode 120000
index 2d0f9e1..0000000
--- a/mini/config/chroot_local-hooks/ipw2200.sh
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/live-helper/examples/hooks/ipw2200.sh
\ No newline at end of file
diff --git a/mini/config/chroot_local-hooks/perms b/mini/config/chroot_local-hooks/perms
new file mode 100755
index 0000000..b797f3d
--- /dev/null
+++ b/mini/config/chroot_local-hooks/perms
@@ -0,0 +1,3 @@
+# TODO: fix this as it does not seem to work
+echo Chowning webc
+chown -R webc:webc ~webc
diff --git a/mini/config/chroot_local-hooks/stripped b/mini/config/chroot_local-hooks/stripped
index b10b384..4c359f7 100755
--- a/mini/config/chroot_local-hooks/stripped
+++ b/mini/config/chroot_local-hooks/stripped
@@ -11,7 +11,36 @@ set -e
 
 # Removing unused packages
 # python-2.5
-for PACKAGE in aptitude man-db manpages info dselect bsdmainutils manpages gcc-4.1 traceroute 
+# Rip out X extensions
+for PACKAGE in aptitude man-db manpages info dselect bsdmainutils manpages gcc-4.1 traceroute \
+xserver-xorg-input-synaptics \
+xserver-xorg-video-apm \
+xserver-xorg-video-chips \
+xserver-xorg-video-imstt \
+xserver-xorg-video-mga \
+xserver-xorg-video-neomagic \
+xserver-xorg-video-newport \
+xserver-xorg-video-nsc \
+xserver-xorg-video-nv \
+xserver-xorg-video-rendition \
+xserver-xorg-video-s3 \
+xserver-xorg-video-s3virge \
+xserver-xorg-video-savage \
+xserver-xorg-video-siliconmotion \
+xserver-xorg-video-sisusb \
+xserver-xorg-video-tdfx \
+xserver-xorg-video-tga \
+xserver-xorg-video-trident \
+xserver-xorg-video-tseng \
+xserver-xorg-video-v4l \
+xserver-xorg-video-vga \
+xserver-xorg-input-wacom \
+xserver-xorg-video-ark \
+xserver-xorg-video-cirrus \
+xserver-xorg-video-cyrix \
+xserver-xorg-video-dummy \
+xserver-xorg-video-fbdev \
+xserver-xorg-video-glint
 do
 	if ! apt-get remove --purge --yes "${PACKAGE}"
 	then
@@ -25,7 +54,7 @@ apt-get autoremove --yes || true
 find . -name *~ | xargs rm -f
 
 rm -rf /usr/include/*
-#rm -rf /usr/share/groff/*
+rm -rf /usr/share/groff/*
 rm -rf /usr/share/doc/*
 rm -rf /usr/share/locale/*
 rm -rf /usr/share/man/*
diff --git a/mini/config/chroot_local-hooks/xorg b/mini/config/chroot_local-hooks/xorg
new file mode 100755
index 0000000..2d63196
--- /dev/null
+++ b/mini/config/chroot_local-hooks/xorg
@@ -0,0 +1,2 @@
+rm /etc/X11/xorg.conf
+ln -s rm /etc/X11/xorg.webc.conf /etc/X11/xorg.conf
diff --git a/mini/config/chroot_local-packages/dbus_1.2.1-1_i386.deb b/mini/config/chroot_local-packages/dbus_1.2.1-1_i386.deb
deleted file mode 100644
index 8def54a..0000000
Binary files a/mini/config/chroot_local-packages/dbus_1.2.1-1_i386.deb and /dev/null differ
diff --git a/mini/config/chroot_local-packages/iceweasel-webconverger_6-24_all.deb b/mini/config/chroot_local-packages/iceweasel-webconverger_6-24_all.deb
deleted file mode 100644
index 86b56c1..0000000
Binary files a/mini/config/chroot_local-packages/iceweasel-webconverger_6-24_all.deb and /dev/null differ
diff --git a/mini/config/chroot_local-packages/iceweasel_3.0~b5-4_i386.deb b/mini/config/chroot_local-packages/iceweasel_3.0~b5-4_i386.deb
deleted file mode 100644
index 1f6027a..0000000
Binary files a/mini/config/chroot_local-packages/iceweasel_3.0~b5-4_i386.deb and /dev/null differ
diff --git a/mini/config/chroot_local-packages/libcairo2_1.6.4-1_i386.deb b/mini/config/chroot_local-packages/libcairo2_1.6.4-1_i386.deb
deleted file mode 100644
index 7a259f6..0000000
Binary files a/mini/config/chroot_local-packages/libcairo2_1.6.4-1_i386.deb and /dev/null differ
diff --git a/mini/config/chroot_local-packages/libdbus-1-3_1.2.1-1_i386.deb b/mini/config/chroot_local-packages/libdbus-1-3_1.2.1-1_i386.deb
deleted file mode 100644
index ca05644..0000000
Binary files a/mini/config/chroot_local-packages/libdbus-1-3_1.2.1-1_i386.deb and /dev/null differ
diff --git a/mini/config/chroot_local-packages/libdbus-glib-1-2_0.74-2_i386.deb b/mini/config/chroot_local-packages/libdbus-glib-1-2_0.74-2_i386.deb
deleted file mode 100644
index fa1c663..0000000
Binary files a/mini/config/chroot_local-packages/libdbus-glib-1-2_0.74-2_i386.deb and /dev/null differ
diff --git a/mini/config/chroot_local-packages/libpixman-1-0_0.10.0-2_i386.deb b/mini/config/chroot_local-packages/libpixman-1-0_0.10.0-2_i386.deb
deleted file mode 100644
index 0f88608..0000000
Binary files a/mini/config/chroot_local-packages/libpixman-1-0_0.10.0-2_i386.deb and /dev/null differ
diff --git a/mini/config/chroot_local-packages/webconverger-base_2.39_i386.deb b/mini/config/chroot_local-packages/webconverger-base_2.39_i386.deb
deleted file mode 100644
index ddb4573..0000000
Binary files a/mini/config/chroot_local-packages/webconverger-base_2.39_i386.deb and /dev/null differ
diff --git a/mini/config/chroot_local-packages/xulrunner-1.9_1.9~b5-4_i386.deb b/mini/config/chroot_local-packages/xulrunner-1.9_1.9~b5-4_i386.deb
deleted file mode 100644
index 025e4ef..0000000
Binary files a/mini/config/chroot_local-packages/xulrunner-1.9_1.9~b5-4_i386.deb and /dev/null differ
diff --git a/mini/config/chroot_local-packageslists/en_US.dict b/mini/config/chroot_local-packageslists/en
similarity index 100%
rename from mini/config/chroot_local-packageslists/en_US.dict
rename to mini/config/chroot_local-packageslists/en
diff --git a/mini/config/chroot_local-packageslists/wireless b/mini/config/chroot_local-packageslists/wireless
new file mode 100644
index 0000000..a0e499d
--- /dev/null
+++ b/mini/config/chroot_local-packageslists/wireless
@@ -0,0 +1 @@
+wpasupplicant
diff --git a/webconverger/config/chroot b/webconverger/config/chroot
index d4cd115..1736da0 100644
--- a/webconverger/config/chroot
+++ b/webconverger/config/chroot
@@ -30,7 +30,7 @@ LH_UNION_FILESYSTEM="aufs"
 
 # $LH_LINUX_FLAVOURS: set kernel flavour to use
 # (Default: autodetected)
-#LH_LINUX_FLAVOURS="486"
+LH_LINUX_FLAVOURS="486"
 
 # $LH_LINUX_PACKAGES: set kernel packages to use
 # (Default: autodetected)
diff --git a/mini/config/chroot_local-hooks/stripped b/webconverger/config/chroot_local-hooks/stripped
similarity index 90%
copy from mini/config/chroot_local-hooks/stripped
copy to webconverger/config/chroot_local-hooks/stripped
index b10b384..e99249d 100755
--- a/mini/config/chroot_local-hooks/stripped
+++ b/webconverger/config/chroot_local-hooks/stripped
@@ -11,7 +11,7 @@ set -e
 
 # Removing unused packages
 # python-2.5
-for PACKAGE in aptitude man-db manpages info dselect bsdmainutils manpages gcc-4.1 traceroute 
+for PACKAGE in aptitude man-db manpages info dselect bsdmainutils manpages gcc-4.1 traceroute
 do
 	if ! apt-get remove --purge --yes "${PACKAGE}"
 	then
@@ -27,13 +27,13 @@ find . -name *~ | xargs rm -f
 rm -rf /usr/include/*
 #rm -rf /usr/share/groff/*
 rm -rf /usr/share/doc/*
-rm -rf /usr/share/locale/*
+#rm -rf /usr/share/locale/*
 rm -rf /usr/share/man/*
-rm -rf /usr/share/i18n/*
+#rm -rf /usr/share/i18n/*
 rm -rf /usr/share/info/*
 rm -rf /usr/share/lintian/*
 rm -rf /usr/share/linda/*
-rm -rf /usr/share/zoneinfo/*
+#rm -rf /usr/share/zoneinfo/*
 rm -rf /var/cache/man/*
 
 # Cleaning apt lists
diff --git a/mini/config/chroot_local-hooks/theme b/webconverger/config/chroot_local-hooks/theme
similarity index 100%
copy from mini/config/chroot_local-hooks/theme
copy to webconverger/config/chroot_local-hooks/theme
diff --git a/mini/config/chroot_local-hooks/webconverger b/webconverger/config/chroot_local-hooks/webconverger
similarity index 100%
copy from mini/config/chroot_local-hooks/webconverger
copy to webconverger/config/chroot_local-hooks/webconverger
diff --git a/webconverger/config/chroot_local-includes/etc/apt/preferences b/webconverger/config/chroot_local-includes/etc/apt/preferences
new file mode 100644
index 0000000..f6ecef6
--- /dev/null
+++ b/webconverger/config/chroot_local-includes/etc/apt/preferences
@@ -0,0 +1,3 @@
+Package: *
+Pin: release o=webconverger
+Pin-Priority: 1001
diff --git a/webconverger/config/chroot_local-packageslists/webconverger b/webconverger/config/chroot_local-packageslists/webconverger
index a1f6e88..10e349b 100644
--- a/webconverger/config/chroot_local-packageslists/webconverger
+++ b/webconverger/config/chroot_local-packageslists/webconverger
@@ -1,6 +1,6 @@
 # Webconverger's main configuration hendry at webconverger.com
 # Minimal
-eject file sudo vim-tiny
+eject file sudo
 
 # Standard
 console-common kbd locales
@@ -13,7 +13,6 @@ alsa-base alsa-oss alsa-utils
 
 # For upgrade, firewall et al. features
 live-initscripts
-#rsync
 
 webconverger-base
 webconverger-archive-keyring
@@ -25,13 +24,13 @@ dwm
 xloadimage
 
 # browser
-#iceweasel
+iceweasel
 
 # For reseting the kiosk
 xautolock
 
 # For locking down the browser
-#iceweasel-webconverger
+iceweasel-webconverger
 
 # fonts
 ttf-dejavu
diff --git a/webconverger/config/chroot_local-packageslists/wireless b/webconverger/config/chroot_local-packageslists/wireless
new file mode 100644
index 0000000..a0e499d
--- /dev/null
+++ b/webconverger/config/chroot_local-packageslists/wireless
@@ -0,0 +1 @@
+wpasupplicant
diff --git a/webconverger/config/chroot_sources/webc.chroot b/webconverger/config/chroot_sources/webc.chroot
index d9129d4..2240a1f 100644
--- a/webconverger/config/chroot_sources/webc.chroot
+++ b/webconverger/config/chroot_sources/webc.chroot
@@ -1,4 +1,4 @@
 deb http://debian.webconverger.com/ lenny/
 deb-src http://debian.webconverger.com/ lenny/
 
-deb ftp://ftp.debian.org/debian experimental main
+#deb ftp://ftp.debian.org/debian experimental main

-- 
debian-live/config-webc

More information about the debian-live-changes mailing list