[SCM] debian-live/config-webc branch, squeeze, updated. bbb35836e060c63130f04e607eca911bf0e0c001
Daniel Baumann
daniel at debian.org
Sun Sep 5 16:01:47 UTC 2010
The following commit has been merged in the squeeze branch:
commit bbb35836e060c63130f04e607eca911bf0e0c001
Author: Daniel Baumann <daniel at debian.org>
Date: Sun Sep 5 18:01:32 2010 +0200
Updating config tree for squeeze.
diff --git a/webconverger/auto/config b/webconverger/auto/config
index 0d65be5..568006b 100755
--- a/webconverger/auto/config
+++ b/webconverger/auto/config
@@ -5,7 +5,7 @@ MIRROR_DEBIAN="http://ftp.de.debian.org/debian"
lh config noauto \
--apt-recommends false \
- --bootappend-live "quiet homepage=http://portal.webconverger.com nonetworking nosudo splash video=vesa:ywrap,mtrr vga=788 nopersistent quickreboot" \
+ --bootappend-live "quiet homepage=http://portal.webconverger.com nonetworking noroot splash video=vesa:ywrap,mtrr vga=788 nopersistent quickreboot" \
--cache-stages "bootstrap rootfs" \
--debian-installer-distribution sid \
-k 486 \
@@ -20,7 +20,6 @@ lh config noauto \
--distribution squeeze \
--iso-publisher "Webconverger; http://webconverger.com/; support at webconverger.com" \
--iso-volume "Webconverger $(date +%Y%m%d-%H:%M)" \
- --linux-packages "linux-image-2.6 aufs-modules-2.6" \
--memtest none \
--syslinux-splash config/binary_syslinux/splash.rle \
--syslinux-timeout 5 \
@@ -28,4 +27,5 @@ lh config noauto \
--binary-indices false \
--win32-loader false \
--source false \
+ --repositories unofficial.debian-maintainers.org \
${@}
diff --git a/webconverger/config/chroot_sources/kernel-backports.binary b/webconverger/config/chroot_sources/kernel-backports.binary
deleted file mode 100644
index b37574b..0000000
--- a/webconverger/config/chroot_sources/kernel-backports.binary
+++ /dev/null
@@ -1,5 +0,0 @@
-deb http://unsupported.debian-maintainers.org/backports-kernel/ ./
-deb-src http://unsupported.debian-maintainers.org/backports-kernel/ ./
-
-deb http://unsupported.debian-maintainers.org/backports/ ./
-deb-src http://unsupported.debian-maintainers.org/backports/ ./
diff --git a/webconverger/config/chroot_sources/kernel-backports.binary.gpg b/webconverger/config/chroot_sources/kernel-backports.binary.gpg
deleted file mode 100644
index 7f9b836..0000000
--- a/webconverger/config/chroot_sources/kernel-backports.binary.gpg
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.9 (GNU/Linux)
-
-mQENBEtljiMBCADSIplButAWL0OuM4uvDtZYjBcPlQNjwQDZ/Dpg5QuRAgNSUdx7
-wBQOQXqC4LCi9ykpvYi8FEtz0bl60M9uJdc4n+130It8gSZs7Cn0WoFk7uo0S4IS
-79EQdP+yfZNv/vY11cv6TwOb7JEqB5BI7T642Y+UgQZnpT/Diykks986CYeZSfpm
-6gnASAEe0jJg79Zpzpc3kBECCwN6fIFZ4MOxkaXgvfhWsOS42s6zxtQXJ65njibR
-W47Klu75sxPS+5EKaS10C5+Tmv0XpV7S7s8VtRtKemMjYfLdsPmubmGcI+t/uEF7
-qT2zJLINSIIL01kpVBFpqxCmnO51XURgRqOFABEBAAG0Z2RlYmlhbi1tYWludGFp
-bmVycy5vcmcgQXJjaGl2ZSBBdXRvbWF0aWMgU2lnbmluZyBLZXkgKDIwMTAwMTAx
-KSA8c3lzYWRtaW5AbGlzdHMuZGViaWFuLW1haW50YWluZXJzLm9yZz6JAT4EEwEC
-ACgFAktljiMCGwMFCQHihQAGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEJ7r
-yNubnDy2BeUH/1SWIbqzIh2LkF1XK4iXyXGrzGlqtef5JX/tjaY7RC5gPVyZBP1V
-jHcozn7Sum09KxaijsgP/lIVZ2tnu9niT2Waz5GPgUv79bqjGc238gEhH5zpbun/
-WF6UapiINHNYLFx0f18ImQ1gU13hLn0PYvuyN/QKmxaPlcUQtNJc3/ZtyFA0nPpB
-ejiMEBxgw0H80FWSpawLKUFEStT1Y+khK0fZYVoWl0OwhJbsY/L6nBcfv27zH+5d
-g7VuNpRte7AyxZEufescwWILTjIq3K2v9XHAy7sJmstfycrHQFy/33hE4yRQcOyu
-bAMnNqLUp7mwqRw+KYPkAQo/DUlO//SsUKY=
-=+IFy
------END PGP PUBLIC KEY BLOCK-----
diff --git a/webconverger/config/chroot_sources/kernel-backports.chroot b/webconverger/config/chroot_sources/kernel-backports.chroot
deleted file mode 100644
index b37574b..0000000
--- a/webconverger/config/chroot_sources/kernel-backports.chroot
+++ /dev/null
@@ -1,5 +0,0 @@
-deb http://unsupported.debian-maintainers.org/backports-kernel/ ./
-deb-src http://unsupported.debian-maintainers.org/backports-kernel/ ./
-
-deb http://unsupported.debian-maintainers.org/backports/ ./
-deb-src http://unsupported.debian-maintainers.org/backports/ ./
diff --git a/webconverger/config/chroot_sources/kernel-backports.chroot.gpg b/webconverger/config/chroot_sources/kernel-backports.chroot.gpg
deleted file mode 100644
index 7f9b836..0000000
--- a/webconverger/config/chroot_sources/kernel-backports.chroot.gpg
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.9 (GNU/Linux)
-
-mQENBEtljiMBCADSIplButAWL0OuM4uvDtZYjBcPlQNjwQDZ/Dpg5QuRAgNSUdx7
-wBQOQXqC4LCi9ykpvYi8FEtz0bl60M9uJdc4n+130It8gSZs7Cn0WoFk7uo0S4IS
-79EQdP+yfZNv/vY11cv6TwOb7JEqB5BI7T642Y+UgQZnpT/Diykks986CYeZSfpm
-6gnASAEe0jJg79Zpzpc3kBECCwN6fIFZ4MOxkaXgvfhWsOS42s6zxtQXJ65njibR
-W47Klu75sxPS+5EKaS10C5+Tmv0XpV7S7s8VtRtKemMjYfLdsPmubmGcI+t/uEF7
-qT2zJLINSIIL01kpVBFpqxCmnO51XURgRqOFABEBAAG0Z2RlYmlhbi1tYWludGFp
-bmVycy5vcmcgQXJjaGl2ZSBBdXRvbWF0aWMgU2lnbmluZyBLZXkgKDIwMTAwMTAx
-KSA8c3lzYWRtaW5AbGlzdHMuZGViaWFuLW1haW50YWluZXJzLm9yZz6JAT4EEwEC
-ACgFAktljiMCGwMFCQHihQAGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEJ7r
-yNubnDy2BeUH/1SWIbqzIh2LkF1XK4iXyXGrzGlqtef5JX/tjaY7RC5gPVyZBP1V
-jHcozn7Sum09KxaijsgP/lIVZ2tnu9niT2Waz5GPgUv79bqjGc238gEhH5zpbun/
-WF6UapiINHNYLFx0f18ImQ1gU13hLn0PYvuyN/QKmxaPlcUQtNJc3/ZtyFA0nPpB
-ejiMEBxgw0H80FWSpawLKUFEStT1Y+khK0fZYVoWl0OwhJbsY/L6nBcfv27zH+5d
-g7VuNpRte7AyxZEufescwWILTjIq3K2v9XHAy7sJmstfycrHQFy/33hE4yRQcOyu
-bAMnNqLUp7mwqRw+KYPkAQo/DUlO//SsUKY=
-=+IFy
------END PGP PUBLIC KEY BLOCK-----
diff --git a/webconverger/config/chroot_sources/mozilla.binary b/webconverger/config/chroot_sources/mozilla.binary
deleted file mode 100644
index 668c8ed..0000000
--- a/webconverger/config/chroot_sources/mozilla.binary
+++ /dev/null
@@ -1,2 +0,0 @@
-deb http://backports.debian-maintainers.org/ squeeze/backports-client-mozilla main contrib non-free
-deb-src http://backports.debian-maintainers.org/ squeeze/backports-client-mozilla main contrib non-free
diff --git a/webconverger/config/chroot_sources/mozilla.binary.gpg b/webconverger/config/chroot_sources/mozilla.binary.gpg
deleted file mode 100644
index 3456d93..0000000
--- a/webconverger/config/chroot_sources/mozilla.binary.gpg
+++ /dev/null
@@ -1,31 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.10 (GNU/Linux)
-
-mQINBEqdKDABEADBLagcqCJZea/V62l/ow6qo0gjmMOSiF8oi5HJmFfHoX1hogTP
-JCaemzc8/CVBQ9ryLRyIfxVT367tBHweWFIEJZUnNINFYLsQms8WOex5fKZkRrox
-ROsKDh+zeaUWeKEEG9Z9SAvpvPS50L3KnwKiZZE1tFY4LitVDapw+C7ElmLrvdhq
-O9Gg6TohO7Q6hNA266InZggnNFI2Fs6GmfdcxlSc3rcBJj60/5imtXu1b/zO2EgX
-1Mhc4DRFRC2N/ywEB4XzF7Dc/EdFbhyQt+et3u6Hr0OqNBZfN61vCYj4G/+3hj6m
-/FUkz2SUrXpSIf7uBxZwGRWq6En9GKDSqJjVFuNfRmAhSO6ywiZ+3bbOu93rGDl0
-RGxmst19GrBFv1fgAWv//UTf1f3461poFQBsbEQ2FhJt+06x5x6sm6uKUeznC5Gr
-DihYcXgAPWVHmxuDtGJUgwSQCBCmEPZVI/25pvR1uxxOXldXv5glaSeslZjCGdzv
-72g2sV5ACjWsAaLAJCZcp9BtgImTTYqV3CEPsWIY/hqzHLFcpfpok4CkPNHzQVrg
-VaGSH2KqvUXl5joyuKmF77hqtWoDxSU8urVbcij/TYejoo99BgpEuq1yPwaU7Sdy
-ZvBO+TIxO28/JldgTJ0SKdYUyyaV8fBiwMzFsbjAYa06X0barbsUpg01zQARAQAB
-tGdkZWJpYW4tbWFpbnRhaW5lcnMub3JnIEFyY2hpdmUgQXV0b21hdGljIFNpZ25p
-bmcgS2V5ICgyMDA5MDkwMSkgPHN5c2FkbWluQGxpc3RzLmRlYmlhbi1tYWludGFp
-bmVycy5vcmc+iQI9BBMBCAAnBQJKnSgwAhsDBQkAybWABQsJCAcDBRUKCQgLBRYC
-AwEAAh4BAheAAAoJEEUyUiR/CNd+gigP/iAWMn2xLgFQqoaDPzq1vdewll6WDcfi
-XQ7AW5wwrhwr5YMOdX+MQfrIIqwYhnEHHpkky7a1jzkYWTm2h0217Ev7AZ5fBl47
-vtWOcFU57BKgl0lUBRcYNmSqWNCsuw5iPuBgY/bD22aRO+JHVj5lcaK2JKUiHtBd
-oML9uqNbahQTlIW1c7r66pOENwDjWuqdfYkh4bRU4/gAEanKpViqT30NwUkVQcBD
-wVH73vV9BoFUEtPxPrZw431wAxKgO4fJpz0iWXx0yFkpnLqUAhtwv/Befd4yE8Fy
-q4Iv7ci9+oVROQ6R5Yd2kaadtwC498TPncUzr07gPXR/q1j2/K7kJuTlUyVv/z5U
-p63/uOtbRrX/9vC8VCIaXfi2JXpMhzs9zN6mjjPCLhmoC50h234SGrWHJ0zJPYW5
-TDDeOBff3nv4mXdZ5/OyYTdIZkI7YOfcGzA1Z80kha2FBhAYWmyxUld0PDqeaTRd
-A2+xjf1e20rs6ZN9+Hwb7kiJeJhhClsXybMfSyRToSS2lbLzzPt0fX5QSMwCH1LU
-eASRVH7yIruYbUWRyIlT8vsXwSQeYjEo35K8+qPII3uH+zkpUY0L0XQZcwd/qap0
-t7gKexWh3jaMJUhbqGxgOxtBQ879xKxRuL9fVmF3vovn58mlIRabFYyvQRRNVD8X
-ZkV6m4jPd7dw
-=qjHD
------END PGP PUBLIC KEY BLOCK-----
diff --git a/webconverger/config/chroot_sources/mozilla.chroot b/webconverger/config/chroot_sources/mozilla.chroot
deleted file mode 100644
index 668c8ed..0000000
--- a/webconverger/config/chroot_sources/mozilla.chroot
+++ /dev/null
@@ -1,2 +0,0 @@
-deb http://backports.debian-maintainers.org/ squeeze/backports-client-mozilla main contrib non-free
-deb-src http://backports.debian-maintainers.org/ squeeze/backports-client-mozilla main contrib non-free
diff --git a/webconverger/config/chroot_sources/mozilla.chroot.gpg b/webconverger/config/chroot_sources/mozilla.chroot.gpg
deleted file mode 100644
index 3456d93..0000000
--- a/webconverger/config/chroot_sources/mozilla.chroot.gpg
+++ /dev/null
@@ -1,31 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.10 (GNU/Linux)
-
-mQINBEqdKDABEADBLagcqCJZea/V62l/ow6qo0gjmMOSiF8oi5HJmFfHoX1hogTP
-JCaemzc8/CVBQ9ryLRyIfxVT367tBHweWFIEJZUnNINFYLsQms8WOex5fKZkRrox
-ROsKDh+zeaUWeKEEG9Z9SAvpvPS50L3KnwKiZZE1tFY4LitVDapw+C7ElmLrvdhq
-O9Gg6TohO7Q6hNA266InZggnNFI2Fs6GmfdcxlSc3rcBJj60/5imtXu1b/zO2EgX
-1Mhc4DRFRC2N/ywEB4XzF7Dc/EdFbhyQt+et3u6Hr0OqNBZfN61vCYj4G/+3hj6m
-/FUkz2SUrXpSIf7uBxZwGRWq6En9GKDSqJjVFuNfRmAhSO6ywiZ+3bbOu93rGDl0
-RGxmst19GrBFv1fgAWv//UTf1f3461poFQBsbEQ2FhJt+06x5x6sm6uKUeznC5Gr
-DihYcXgAPWVHmxuDtGJUgwSQCBCmEPZVI/25pvR1uxxOXldXv5glaSeslZjCGdzv
-72g2sV5ACjWsAaLAJCZcp9BtgImTTYqV3CEPsWIY/hqzHLFcpfpok4CkPNHzQVrg
-VaGSH2KqvUXl5joyuKmF77hqtWoDxSU8urVbcij/TYejoo99BgpEuq1yPwaU7Sdy
-ZvBO+TIxO28/JldgTJ0SKdYUyyaV8fBiwMzFsbjAYa06X0barbsUpg01zQARAQAB
-tGdkZWJpYW4tbWFpbnRhaW5lcnMub3JnIEFyY2hpdmUgQXV0b21hdGljIFNpZ25p
-bmcgS2V5ICgyMDA5MDkwMSkgPHN5c2FkbWluQGxpc3RzLmRlYmlhbi1tYWludGFp
-bmVycy5vcmc+iQI9BBMBCAAnBQJKnSgwAhsDBQkAybWABQsJCAcDBRUKCQgLBRYC
-AwEAAh4BAheAAAoJEEUyUiR/CNd+gigP/iAWMn2xLgFQqoaDPzq1vdewll6WDcfi
-XQ7AW5wwrhwr5YMOdX+MQfrIIqwYhnEHHpkky7a1jzkYWTm2h0217Ev7AZ5fBl47
-vtWOcFU57BKgl0lUBRcYNmSqWNCsuw5iPuBgY/bD22aRO+JHVj5lcaK2JKUiHtBd
-oML9uqNbahQTlIW1c7r66pOENwDjWuqdfYkh4bRU4/gAEanKpViqT30NwUkVQcBD
-wVH73vV9BoFUEtPxPrZw431wAxKgO4fJpz0iWXx0yFkpnLqUAhtwv/Befd4yE8Fy
-q4Iv7ci9+oVROQ6R5Yd2kaadtwC498TPncUzr07gPXR/q1j2/K7kJuTlUyVv/z5U
-p63/uOtbRrX/9vC8VCIaXfi2JXpMhzs9zN6mjjPCLhmoC50h234SGrWHJ0zJPYW5
-TDDeOBff3nv4mXdZ5/OyYTdIZkI7YOfcGzA1Z80kha2FBhAYWmyxUld0PDqeaTRd
-A2+xjf1e20rs6ZN9+Hwb7kiJeJhhClsXybMfSyRToSS2lbLzzPt0fX5QSMwCH1LU
-eASRVH7yIruYbUWRyIlT8vsXwSQeYjEo35K8+qPII3uH+zkpUY0L0XQZcwd/qap0
-t7gKexWh3jaMJUhbqGxgOxtBQ879xKxRuL9fVmF3vovn58mlIRabFYyvQRRNVD8X
-ZkV6m4jPd7dw
-=qjHD
------END PGP PUBLIC KEY BLOCK-----
diff --git a/webconverger/config/chroot_sources/restricted.binary b/webconverger/config/chroot_sources/restricted.binary
deleted file mode 100644
index 10d079e..0000000
--- a/webconverger/config/chroot_sources/restricted.binary
+++ /dev/null
@@ -1,2 +0,0 @@
-deb http://unofficial.debian-maintainers.org/ squeeze main contrib non-free restricted
-deb-src http://unofficial.debian-maintainers.org/ squeeze main contrib non-free restricted
diff --git a/webconverger/config/chroot_sources/restricted.binary.gpg b/webconverger/config/chroot_sources/restricted.binary.gpg
deleted file mode 100644
index 7f9b836..0000000
--- a/webconverger/config/chroot_sources/restricted.binary.gpg
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.9 (GNU/Linux)
-
-mQENBEtljiMBCADSIplButAWL0OuM4uvDtZYjBcPlQNjwQDZ/Dpg5QuRAgNSUdx7
-wBQOQXqC4LCi9ykpvYi8FEtz0bl60M9uJdc4n+130It8gSZs7Cn0WoFk7uo0S4IS
-79EQdP+yfZNv/vY11cv6TwOb7JEqB5BI7T642Y+UgQZnpT/Diykks986CYeZSfpm
-6gnASAEe0jJg79Zpzpc3kBECCwN6fIFZ4MOxkaXgvfhWsOS42s6zxtQXJ65njibR
-W47Klu75sxPS+5EKaS10C5+Tmv0XpV7S7s8VtRtKemMjYfLdsPmubmGcI+t/uEF7
-qT2zJLINSIIL01kpVBFpqxCmnO51XURgRqOFABEBAAG0Z2RlYmlhbi1tYWludGFp
-bmVycy5vcmcgQXJjaGl2ZSBBdXRvbWF0aWMgU2lnbmluZyBLZXkgKDIwMTAwMTAx
-KSA8c3lzYWRtaW5AbGlzdHMuZGViaWFuLW1haW50YWluZXJzLm9yZz6JAT4EEwEC
-ACgFAktljiMCGwMFCQHihQAGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEJ7r
-yNubnDy2BeUH/1SWIbqzIh2LkF1XK4iXyXGrzGlqtef5JX/tjaY7RC5gPVyZBP1V
-jHcozn7Sum09KxaijsgP/lIVZ2tnu9niT2Waz5GPgUv79bqjGc238gEhH5zpbun/
-WF6UapiINHNYLFx0f18ImQ1gU13hLn0PYvuyN/QKmxaPlcUQtNJc3/ZtyFA0nPpB
-ejiMEBxgw0H80FWSpawLKUFEStT1Y+khK0fZYVoWl0OwhJbsY/L6nBcfv27zH+5d
-g7VuNpRte7AyxZEufescwWILTjIq3K2v9XHAy7sJmstfycrHQFy/33hE4yRQcOyu
-bAMnNqLUp7mwqRw+KYPkAQo/DUlO//SsUKY=
-=+IFy
------END PGP PUBLIC KEY BLOCK-----
diff --git a/webconverger/config/chroot_sources/restricted.chroot b/webconverger/config/chroot_sources/restricted.chroot
deleted file mode 100644
index 10d079e..0000000
--- a/webconverger/config/chroot_sources/restricted.chroot
+++ /dev/null
@@ -1,2 +0,0 @@
-deb http://unofficial.debian-maintainers.org/ squeeze main contrib non-free restricted
-deb-src http://unofficial.debian-maintainers.org/ squeeze main contrib non-free restricted
diff --git a/webconverger/config/chroot_sources/restricted.chroot.gpg b/webconverger/config/chroot_sources/restricted.chroot.gpg
deleted file mode 100644
index 7f9b836..0000000
--- a/webconverger/config/chroot_sources/restricted.chroot.gpg
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.9 (GNU/Linux)
-
-mQENBEtljiMBCADSIplButAWL0OuM4uvDtZYjBcPlQNjwQDZ/Dpg5QuRAgNSUdx7
-wBQOQXqC4LCi9ykpvYi8FEtz0bl60M9uJdc4n+130It8gSZs7Cn0WoFk7uo0S4IS
-79EQdP+yfZNv/vY11cv6TwOb7JEqB5BI7T642Y+UgQZnpT/Diykks986CYeZSfpm
-6gnASAEe0jJg79Zpzpc3kBECCwN6fIFZ4MOxkaXgvfhWsOS42s6zxtQXJ65njibR
-W47Klu75sxPS+5EKaS10C5+Tmv0XpV7S7s8VtRtKemMjYfLdsPmubmGcI+t/uEF7
-qT2zJLINSIIL01kpVBFpqxCmnO51XURgRqOFABEBAAG0Z2RlYmlhbi1tYWludGFp
-bmVycy5vcmcgQXJjaGl2ZSBBdXRvbWF0aWMgU2lnbmluZyBLZXkgKDIwMTAwMTAx
-KSA8c3lzYWRtaW5AbGlzdHMuZGViaWFuLW1haW50YWluZXJzLm9yZz6JAT4EEwEC
-ACgFAktljiMCGwMFCQHihQAGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEJ7r
-yNubnDy2BeUH/1SWIbqzIh2LkF1XK4iXyXGrzGlqtef5JX/tjaY7RC5gPVyZBP1V
-jHcozn7Sum09KxaijsgP/lIVZ2tnu9niT2Waz5GPgUv79bqjGc238gEhH5zpbun/
-WF6UapiINHNYLFx0f18ImQ1gU13hLn0PYvuyN/QKmxaPlcUQtNJc3/ZtyFA0nPpB
-ejiMEBxgw0H80FWSpawLKUFEStT1Y+khK0fZYVoWl0OwhJbsY/L6nBcfv27zH+5d
-g7VuNpRte7AyxZEufescwWILTjIq3K2v9XHAy7sJmstfycrHQFy/33hE4yRQcOyu
-bAMnNqLUp7mwqRw+KYPkAQo/DUlO//SsUKY=
-=+IFy
------END PGP PUBLIC KEY BLOCK-----
--
debian-live/config-webc
More information about the debian-live-changes
mailing list