From 2879ec58c241829072c18308fb1b9603d1694f98 Mon Sep 17 00:00:00 2001 From: Luca Capello Date: Tue, 3 Jul 2012 17:03:15 -0600 Subject: [PATCH] import babelbox-squeeze.tgz (thanks, tolimar) SHA-1:1e24d3e7c54ddffb96423a6f61e565d078b97a7a, from --- babelbox-grub | 32 +++++++++++++++++----------- cronscript | 2 +- langlist | 59 +++++++++++++++++++++++++++++++++++++++------------ preseed.cfg | 19 ++++++++++------- preseed_early | 2 +- preseed_late | 12 +++-------- xorg.conf | 41 ----------------------------------- 7 files changed, 82 insertions(+), 85 deletions(-) delete mode 100644 xorg.conf diff --git a/babelbox-grub b/babelbox-grub index 7a64574..225a497 100644 --- a/babelbox-grub +++ b/babelbox-grub @@ -1,14 +1,22 @@ +menuentry 'Babelbox install' --class debian --class gnu-linux --class gnu --class os { + insmod part_msdos + insmod ext2 + set root='(hd0,0)' + search --no-floppy --fs-uuid --set 172d7a04-a0ce-4e5a-ac09-a44e1903e0af + echo 'Loading Linux 2.6.32-5-686 ...' + linux /srv/vmlinuz video=vesa:ywrap,mtrr vga=788 priority=critical console-keymaps-at/keymap=de keyboard-configuration/xkb-keymap=de file=/hd-media/srv/babelbox/preseed.cfg debian-installer/locale=en_US + echo 'Loading initial ramdisk ...' + initrd /srv/initrd.gz +} -title Babelbox install -root (hd0,0) -kernel /srv/vmlinuz video=vesa:ywrap,mtrr vga=788 priority=critical console-keymaps-at/keymap=us file=/hd-media/srv/babelbox/preseed.cfg locale=en_US -initrd /srv/initrd.gz -savedefault -boot +menuentry 'Babelbox demo' --class debian --class gnu-linux --class gnu --class os { + insmod part_msdos + insmod ext2 + set root='(hd0,4)' + search --no-floppy --fs-uuid --set 172d7a04-a0ce-4e5a-ac09-a44e1903e0af + echo 'Loading Linux 2.6.32-5-686 ...' + linux /boot/vmlinuz-2.6.32-5-686 root=/dev/sda5 ro quiet + echo 'Loading initial ramdisk ...' + initrd /boot/initrd.img-2.6.32-5-686 +} -title Babelbox demo -root (hd0,4) -kernel /boot/vmlinuz-2.6.26-1-686 root=/dev/sda5 ro quiet -initrd /boot/initrd.img-2.6.26-1-686 -savedefault -boot diff --git a/cronscript b/cronscript index 4b4df61..e7a4aae 100755 --- a/cronscript +++ b/cronscript @@ -39,7 +39,7 @@ GRUBLINE=$(echo "$LANG" | cut -d: -f4) sed -i "s/LANGNAME \".*\"/LANGNAME \"$LANGNAME\"/" preseed_early sed -i "s/locale=.*$/locale=$LOCALE $GRUBLINE/ - s/^default[[:space:]].*$/default\t\t2/" $ROOT/boot/grub/menu.lst + s/^set default=.*$/set default=\"2\"/" $ROOT/boot/grub/grub.cfg # Comment out the next three lines if you don't want the language to change N_LOCALE=$(echo "$NEXTLANG" | cut -d: -f1) diff --git a/langlist b/langlist index ea6d370..8dbf248 100644 --- a/langlist +++ b/langlist @@ -1,41 +1,74 @@ # Languages are used in order; an "x" in the second field indicates the -# current language (nect to be used). +# current language (next to be used). # The first field must contain a valid locale; the fourth field can # optionally contain extra parameters to pass as boot options. -ar_JO::Arabic +am_ET::Amharic +ar_EG::Arabig +ast_ES::Asturian +be_BY::Belarusian bg_BG::Bulgarian -ca_ES::Catalan:DEBIAN_FRONTEND=newt +bn_BD::Bengali +bs_BA::Bosnian +ca_ES::Catalan cs_CZ::Czech da_DK::Danish -de_DE::German:DEBIAN_FRONTEND=newt +de_DE::German dz_BT::Dzongkha el_GR::Greek -en_US:x:English +en_US::English eo_GB::Esperanto -fr_FR::French:DEBIAN_FRONTEND=newt +es_ES::Spanish +et_EE::Estonian +eu_ES::Basque +fa_IR::Persian +fi_FI::Finnish +fr_FR::French +ga_IE::Irish +gl_ES::Galician +gu_IN::Gujarati +he_IL::Hebrew hi_IN::Hindi +hr_HR::Croatian hu_HU::Hungarian id_ID::Indonesian -it_IT::Italian:DEBIAN_FRONTEND=newt +is_IS::Icelandic +it_IT::Italian ja_JP::Japanese -ko_KR::Korean:DEBIAN_FRONTEND=newt +ka_GE::Georgian +kk_KZ::Kazakh +km_KH::Khmer +kn_IN::Kannada +ko_KR::Korean +ku_TR::Kurdish +lo_LA::Lao lt_LT::Lithuanian lv_LV::Latvian -mk_MK::Macedonian:DEBIAN_FRONTEND=newt +mk_MK::Macedonian +ml_IN::Malayalam +mr_IN::Marathi nb_NO::Norwegian Bokmaal +ne_NP::Nepali nl_NL::Dutch +nn_NO::Norwegian Nynorsk pa_IN::Punjabi pl_PL::Polish -pt_PT::Portuguese:DEBIAN_FRONTEND=newt +pt_BR::Portuguese ro_RO::Romanian ru_RU::Russian +se_NO::Northern Sami +si_LK::Sinhala sk_SK::Slovak -sl_SI::Slovenian:DEBIAN_FRONTEND=newt +sl_SI::Slovenian sq_AL::Albanian +sr_RS::Serbian sv_SE::Swedish +ta_IN::Tamil +te_IN::Telugu +th_TH::Thai tl_PH::Tagalog tr_TR::Turkish uk_UA::Ukrainian -vi_VN::Vietnamese:DEBIAN_FRONTEND=newt -wo_SN::Wolof +vi_VN::Vietnamese +zh_CN:X:Chinese (Simplified) +zh_TW::Chinese (Traditional) diff --git a/preseed.cfg b/preseed.cfg index 9a36f80..f194524 100644 --- a/preseed.cfg +++ b/preseed.cfg @@ -33,7 +33,7 @@ d-i netcfg/get_domain string unassigned-domain ### Mirror settings d-i mirror/country string enter information manually -d-i mirror/http/hostname string ftp.nl.debian.org +d-i mirror/http/hostname string 10.0.2.2 d-i mirror/http/directory string /debian d-i mirror/http/proxy string @@ -46,6 +46,7 @@ d-i partman-auto/choose_recipe select atomic # This makes partman automatically partition without confirmation. d-i partman/choose_partition select finish d-i partman/confirm boolean true +d-i partman/confirm_nooverwrite boolean true ### Clock and time zone setup # Controls whether or not the hardware clock is set to UTC. @@ -60,7 +61,7 @@ d-i time/zone string Europe/Amsterdam d-i apt-setup/use_mirror boolean false # We don't need security updates for this -d-i apt-setup/security_host string +d-i apt-setup/services-select multiselect ### Account setup d-i passwd/root-password password r00tme @@ -73,14 +74,16 @@ d-i passwd/user-password password r00tme d-i passwd/user-password-again password r00tme ### Boot loader installation -# Install grub to the 4th partition -# uncomment and edit these lines: -d-i grub-installer/bootdev string (hd0,4) -d-i grub-installer/only_debian boolean false -d-i grub-installer/with_other_os boolean false +d-i grub-installer/skip boolean true +d-i lilo-installer/skip bollean true ### Package selection -tasksel tasksel/first multiselect standard, desktop +## don't install the desktop task, it takes to long to install +tasksel tasksel/first multiselect + +## instead install a quite minimal GNOME setup and desktop-base (for spacefun theme) +d-i pkgsel/include string gdm3, gnome-session, gnome-icon-teme, desktop-base, +xserver-xorg-core, xserver-xorg-input-evdev, xserver-xorg-video-vesa, xserver-xorg # Don't install popcon popularity-contest popularity-contest/participate boolean false diff --git a/preseed_early b/preseed_early index efb2074..ce9770f 100755 --- a/preseed_early +++ b/preseed_early @@ -5,7 +5,7 @@ set -e . /usr/share/debconf/confmodule -db_subst babelbox/info LANGNAME "English" || true +db_subst babelbox/info LANGNAME "Japanese" || true db_info babelbox/info || true mkdir -p /lib/partman/init.d diff --git a/preseed_late b/preseed_late index 29d2e60..708775c 100755 --- a/preseed_late +++ b/preseed_late @@ -5,24 +5,18 @@ set -e -TAB=" " - : >/target/BABELBOX cp /hd-media/srv/babelbox/cronscript /target/root echo "@reboot root /root/cronscript; reboot" >>/target/etc/crontab mount /dev/discs/disc0/part1 /hd-media -o remount,rw -sed -i "s/^default[[:space:]].*$/default${TAB}${TAB}3/" /hd-media/boot/grub/menu.lst +sed -i "s/^set default=.*$/set default=\"3\"/" /hd-media/boot/grub/grub.cfg -if [ -d /target/etc/gdm ] ; then +if [ -d /target/etc/gdm3 ] ; then # Enable automatic login (chroot because of bug in busybox sed) - chroot /target sed -i "/^\[daemon\]/a\AutomaticLoginEnable=true\nAutomaticLogin=debian" /etc/gdm/gdm.conf + chroot /target sed -i "/^\[daemon\]/a\AutomaticLoginEnable = true\nAutomaticLogin = debian" /etc/gdm3/daemon.conf fi -# This is probably no longer needed -#if [ -d /target/etc/X11 ] ; then -# cp /hd-media/srv/babelbox/xorg.conf /target/etc/X11/ -#fi exit 0 diff --git a/xorg.conf b/xorg.conf deleted file mode 100644 index d7bb2f1..0000000 --- a/xorg.conf +++ /dev/null @@ -1,41 +0,0 @@ -# xorg.conf (X.Org X Window System server configuration file) -# -# This file was generated by dexconf, the Debian X Configuration tool, using -# values from the debconf database. -# -# Edit this file with caution, and see the xorg.conf manual page. -# (Type "man xorg.conf" at the shell prompt.) -# -# This file is automatically updated on xserver-xorg package upgrades *only* -# if it has not been modified since the last upgrade of the xserver-xorg -# package. -# -# If you have edited this file but would like it to be automatically updated -# again, run the following command: -# sudo dpkg-reconfigure -phigh xserver-xorg - -Section "InputDevice" - Identifier "Generic Keyboard" - Driver "kbd" - Option "XkbRules" "xorg" - Option "XkbModel" "pc104" - Option "XkbLayout" "us" -EndSection - -Section "InputDevice" - Identifier "Configured Mouse" - Driver "mouse" -EndSection - -Section "Device" - Identifier "Configured Video Device" -EndSection - -Section "Monitor" - Identifier "Configured Monitor" -EndSection - -Section "Screen" - Identifier "Default Screen" - Monitor "Configured Monitor" -EndSection