diff --git a/README.md b/README.md deleted file mode 100644 index 3c2943d..0000000 --- a/README.md +++ /dev/null @@ -1,11 +0,0 @@ -BabelBox -======== - -# Overview - -Automated DebianInstaller testing and demo machine - -# Linked links - -+ [BabelBox - Wiki Debian](https://wiki.debian.org/DebianInstaller/BabelBox) -+ [BabelBox - Debian Salsa repository](https://salsa.debian.org/installer-team/babelbox) diff --git a/babelbox-grub b/babelbox-grub index fc30411..225a497 100644 --- a/babelbox-grub +++ b/babelbox-grub @@ -1,20 +1,22 @@ -menuentry 'BabelBox install' --class debian --class gnu-linux --class gnu --class os { +menuentry 'Babelbox install' --class debian --class gnu-linux --class gnu --class os { insmod part_msdos insmod ext2 - set root='(hd0,1)' - echo 'Loading Linux ...' - linux /srv/vmlinuz video=vesa:ywrap,mtrr vga=788 priority=critical console-keymaps-at/keymap=us keyboard-configuration/xkb-keymap=us file=/hd-media/srv/babelbox/preseed.cfg debian-installer/locale=en_US + 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 } -menuentry 'BabelBox demo' --class debian --class gnu-linux --class gnu --class os { +menuentry 'Babelbox demo' --class debian --class gnu-linux --class gnu --class os { insmod part_msdos insmod ext2 - set root='(hd0,5)' - echo 'Loading Linux ...' - linux /vmlinuz root=/dev/sda5 ro quiet + 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 /initrd.img + initrd /boot/initrd.img-2.6.32-5-686 } diff --git a/cronscript b/cronscript index ded6349..e7a4aae 100755 --- a/cronscript +++ b/cronscript @@ -29,7 +29,7 @@ if [ $(echo "$LANGSEL" | wc -l) -eq 2 ]; then else # Selected language is the last in the file LANG="$LANGSEL" - NEXTLANG="$(egrep -v '^[[:space:]]*(#.*)?$' langlist | head -n1)" + NEXTLANG="$(egrep -v "^[[:space:]]*(#.*)?$" langlist | head -n1)" fi LOCALE=$(echo "$LANG" | cut -d: -f1) @@ -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/^\([[:space:]]*\)set default=\"[[:digit:]]*\"$/\1set default=\"2\"/" $ROOT/boot/grub/grub.cfg + 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/debian/changelog b/debian/changelog new file mode 100644 index 0000000..c6244b4 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,5 @@ +babelbox (0~0) UNRELEASED; urgency=low + + * Initial release. (Closes: #XXXXXX) + + -- Didier Raboud Tue, 03 Jul 2012 22:20:10 -0600 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..45a4fb7 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +8 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..1af90e8 --- /dev/null +++ b/debian/control @@ -0,0 +1,15 @@ +Source: babelbox +Section: utils +Priority: extra +Maintainer: Debian Install System Team +Uploaders: Luca Capello , Didier Raboud +Build-Depends: + debhelper (>= 8), +Standards-Version: 3.9.3 +Vcs-Browser: http://git.debian.org/?p=d-i/babelbox.git +Vcs-Git: git://git.debian.org/d-i/babelbox.git + +Package: babelbox +Architecture: any +Depends: ${misc:Depends}, debian-installer-netboot-${misc:arch} +Description: BabelBox diff --git a/debian/install b/debian/install new file mode 100644 index 0000000..29d97bf --- /dev/null +++ b/debian/install @@ -0,0 +1,8 @@ +00del_partition /usr/share/babelbox/ +choose-mirror.postinst /usr/share/babelbox/ +cronscript /usr/share/babelbox/ +preseed_early /usr/share/babelbox/ +preseed_late /usr/share/babelbox/ +babelbox-grub /usr/share/babelbox/ +langlist /usr/share/babelbox/ +preseed.cfg /usr/share/babelbox/ diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..9cb40f3 --- /dev/null +++ b/debian/rules @@ -0,0 +1,9 @@ +#!/usr/bin/make -f + +DEB_HOST_ARCH ?= $(dpkg-architecture -qDEB_HOST_ARCH) + +%: + dh $@ + +override_dh_gencontrol: + dh_gencontrol -- -Vmisc:arch="${DEB_HOST_ARCH}" diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..89ae9db --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/langlist b/langlist index b066e9a..8dbf248 100644 --- a/langlist +++ b/langlist @@ -3,8 +3,8 @@ # The first field must contain a valid locale; the fourth field can # optionally contain extra parameters to pass as boot options. -am_ET:x:Amharic -ar_EG::Arabic +am_ET::Amharic +ar_EG::Arabig ast_ES::Asturian be_BY::Belarusian bg_BG::Bulgarian @@ -70,5 +70,5 @@ tl_PH::Tagalog tr_TR::Turkish uk_UA::Ukrainian vi_VN::Vietnamese -zh_CN::Chinese (Simplified) +zh_CN:X:Chinese (Simplified) zh_TW::Chinese (Traditional) diff --git a/preseed.cfg b/preseed.cfg index eff667b..f194524 100644 --- a/preseed.cfg +++ b/preseed.cfg @@ -1,4 +1,4 @@ -#### Preseed file for BabelBox +#### Preseed file for Babelbox # See the Installation Guide for other preconfiguration options ### Network configuration @@ -19,10 +19,10 @@ d-i netcfg/dhcp_timeout string 60 #d-i netcfg/disable_dhcp boolean true # Static network configuration. -d-i netcfg/get_nameservers string 10.0.2.3 -d-i netcfg/get_ipaddress string 10.0.2.99 +d-i netcfg/get_nameservers string 192.168.99.1 +d-i netcfg/get_ipaddress string 192.168.99.42 d-i netcfg/get_netmask string 255.255.255.0 -d-i netcfg/get_gateway string 10.0.2.2 +d-i netcfg/get_gateway string 192.168.99.1 d-i netcfg/confirm_static boolean true # Any hostname and domain names assigned from dhcp take precedence over @@ -39,9 +39,9 @@ d-i mirror/http/proxy string ### Partitioning # We use the largest free space available and the simple "all in one" recipe -# for BabelBox -d-i partman-auto/init_automatically_partition select biggest_free -d-i partman-auto/choose_recipe select atomic +# for Babelbox +d-i partman-auto/init_automatically_partition select biggest_free +d-i partman-auto/choose_recipe select atomic # This makes partman automatically partition without confirmation. d-i partman/choose_partition select finish @@ -50,7 +50,7 @@ d-i partman/confirm_nooverwrite boolean true ### Clock and time zone setup # Controls whether or not the hardware clock is set to UTC. -d-i clock-setup/utc boolean true +d-i clock-setup/utc boolean false # You may set this to any valid setting for $TZ; see the contents of # /usr/share/zoneinfo/ for valid values. @@ -75,14 +75,14 @@ d-i passwd/user-password-again password r00tme ### Boot loader installation d-i grub-installer/skip boolean true -d-i lilo-installer/skip boolean true +d-i lilo-installer/skip bollean true ### Package selection ## 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-theme, desktop-base, +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 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 e70889a..708775c 100755 --- a/preseed_late +++ b/preseed_late @@ -11,11 +11,11 @@ echo "@reboot root /root/cronscript; reboot" >>/target/etc/crontab mount /dev/discs/disc0/part1 /hd-media -o remount,rw -sed -i "s/^\([[:space:]]*\)set default=\"[[:digit:]]*\"$/\1set default=\"3\"/" /hd-media/boot/grub/grub.cfg +sed -i "s/^set default=.*$/set default=\"3\"/" /hd-media/boot/grub/grub.cfg if [ -d /target/etc/gdm3 ] ; then # Enable automatic login (chroot because of bug in busybox sed) - in-target sed -i "/^\[daemon\]/a\AutomaticLoginEnable = true\nAutomaticLogin = debian" /etc/gdm3/daemon.conf + chroot /target sed -i "/^\[daemon\]/a\AutomaticLoginEnable = true\nAutomaticLogin = debian" /etc/gdm3/daemon.conf fi