From 2daf1080a09503aa9d09450291718428e9298e1d Mon Sep 17 00:00:00 2001 From: Didier Raboud Date: Wed, 4 Jul 2012 09:30:22 -0600 Subject: [PATCH 01/15] Initial raw packaging. --- debian/changelog | 5 +++++ debian/compat | 1 + debian/control | 15 +++++++++++++++ debian/install | 8 ++++++++ debian/rules | 9 +++++++++ debian/source/format | 1 + 6 files changed, 39 insertions(+) create mode 100644 debian/changelog create mode 100644 debian/compat create mode 100644 debian/control create mode 100644 debian/install create mode 100755 debian/rules create mode 100644 debian/source/format 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) From c44d795ff21161f97cf143d4c4d0eb7427972be5 Mon Sep 17 00:00:00 2001 From: Luca Capello Date: Fri, 2 Nov 2012 18:13:52 +0100 Subject: [PATCH 02/15] langlist: [ar_EG] s/Arabig/Arabic/ --- langlist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/langlist b/langlist index 8dbf248..025c123 100644 --- a/langlist +++ b/langlist @@ -4,7 +4,7 @@ # optionally contain extra parameters to pass as boot options. am_ET::Amharic -ar_EG::Arabig +ar_EG::Arabic ast_ES::Asturian be_BY::Belarusian bg_BG::Bulgarian From 0d92a0345f5d03be2ea6db52413eca0d7e567dea Mon Sep 17 00:00:00 2001 From: Luca Capello Date: Fri, 2 Nov 2012 18:32:27 +0100 Subject: [PATCH 03/15] langlist: NEXTLANG is the first entry --- langlist | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/langlist b/langlist index 025c123..b066e9a 100644 --- a/langlist +++ b/langlist @@ -3,7 +3,7 @@ # The first field must contain a valid locale; the fourth field can # optionally contain extra parameters to pass as boot options. -am_ET::Amharic +am_ET:x:Amharic ar_EG::Arabic ast_ES::Asturian be_BY::Belarusian @@ -70,5 +70,5 @@ tl_PH::Tagalog tr_TR::Turkish uk_UA::Ukrainian vi_VN::Vietnamese -zh_CN:X:Chinese (Simplified) +zh_CN::Chinese (Simplified) zh_TW::Chinese (Traditional) From 0262b6f2d7f553ea40b1ea9d5a348c4a293a0019 Mon Sep 17 00:00:00 2001 From: Luca Capello Date: Fri, 2 Nov 2012 18:38:08 +0100 Subject: [PATCH 04/15] *: default to English and US keyboard layout --- babelbox-grub | 2 +- preseed_early | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/babelbox-grub b/babelbox-grub index 225a497..1763fb2 100644 --- a/babelbox-grub +++ b/babelbox-grub @@ -4,7 +4,7 @@ menuentry 'Babelbox install' --class debian --class gnu-linux --class gnu --clas 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 + 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 echo 'Loading initial ramdisk ...' initrd /srv/initrd.gz } diff --git a/preseed_early b/preseed_early index ce9770f..efb2074 100755 --- a/preseed_early +++ b/preseed_early @@ -5,7 +5,7 @@ set -e . /usr/share/debconf/confmodule -db_subst babelbox/info LANGNAME "Japanese" || true +db_subst babelbox/info LANGNAME "English" || true db_info babelbox/info || true mkdir -p /lib/partman/init.d From 969183bde5f8dfe5d8eeb45bb31dc3e9aad891e3 Mon Sep 17 00:00:00 2001 From: Luca Capello Date: Fri, 2 Nov 2012 18:39:16 +0100 Subject: [PATCH 05/15] babelbox-grub: remove installation-specific search line --- babelbox-grub | 2 -- 1 file changed, 2 deletions(-) diff --git a/babelbox-grub b/babelbox-grub index 1763fb2..0ccd9a8 100644 --- a/babelbox-grub +++ b/babelbox-grub @@ -2,7 +2,6 @@ menuentry 'Babelbox install' --class debian --class gnu-linux --class gnu --clas 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=us keyboard-configuration/xkb-keymap=us file=/hd-media/srv/babelbox/preseed.cfg debian-installer/locale=en_US echo 'Loading initial ramdisk ...' @@ -13,7 +12,6 @@ menuentry 'Babelbox demo' --class debian --class gnu-linux --class gnu --class o 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 ...' From d4378e7de609c05981507ed9ba0604f8eb6af5a5 Mon Sep 17 00:00:00 2001 From: Luca Capello Date: Fri, 2 Nov 2012 18:48:01 +0100 Subject: [PATCH 06/15] babelbox-grub: (#395019) partitions in grub2/1.95-1 start at 1 --- babelbox-grub | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/babelbox-grub b/babelbox-grub index 0ccd9a8..90e281c 100644 --- a/babelbox-grub +++ b/babelbox-grub @@ -1,7 +1,7 @@ menuentry 'Babelbox install' --class debian --class gnu-linux --class gnu --class os { insmod part_msdos insmod ext2 - set root='(hd0,0)' + set root='(hd0,1)' echo 'Loading Linux 2.6.32-5-686 ...' 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 echo 'Loading initial ramdisk ...' @@ -11,7 +11,7 @@ menuentry 'Babelbox install' --class debian --class gnu-linux --class gnu --clas menuentry 'Babelbox demo' --class debian --class gnu-linux --class gnu --class os { insmod part_msdos insmod ext2 - set root='(hd0,4)' + set root='(hd0,5)' 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 ...' From fbe13f8725d6697fd5d0f1dc3f16e02586189f8f Mon Sep 17 00:00:00 2001 From: Luca Capello Date: Sat, 3 Nov 2012 15:08:46 +0100 Subject: [PATCH 07/15] *: be consistent with BabelBox capitalization --- babelbox-grub | 4 ++-- preseed.cfg | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/babelbox-grub b/babelbox-grub index 90e281c..c93e63c 100644 --- a/babelbox-grub +++ b/babelbox-grub @@ -1,4 +1,4 @@ -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)' @@ -8,7 +8,7 @@ menuentry 'Babelbox install' --class debian --class gnu-linux --class gnu --clas 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)' diff --git a/preseed.cfg b/preseed.cfg index f194524..2838d22 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 @@ -39,7 +39,7 @@ d-i mirror/http/proxy string ### Partitioning # We use the largest free space available and the simple "all in one" recipe -# for Babelbox +# for BabelBox d-i partman-auto/init_automatically_partition select biggest_free d-i partman-auto/choose_recipe select atomic From e853d313caaac87456191c10e1abb4a87c3c2759 Mon Sep 17 00:00:00 2001 From: Luca Capello Date: Tue, 6 Nov 2012 17:40:11 +0100 Subject: [PATCH 08/15] preseed_late: use in-target instead of chroot --- preseed_late | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/preseed_late b/preseed_late index 708775c..326e4ac 100755 --- a/preseed_late +++ b/preseed_late @@ -15,7 +15,7 @@ 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) - chroot /target sed -i "/^\[daemon\]/a\AutomaticLoginEnable = true\nAutomaticLogin = debian" /etc/gdm3/daemon.conf + in-target sed -i "/^\[daemon\]/a\AutomaticLoginEnable = true\nAutomaticLogin = debian" /etc/gdm3/daemon.conf fi From df20e1dc40e9881b874849b14fa6c9201a183739 Mon Sep 17 00:00:00 2001 From: Luca Capello Date: Wed, 7 Nov 2012 16:17:11 +0100 Subject: [PATCH 09/15] preseed.cfg: be consistent with spacing (no tabs) --- preseed.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/preseed.cfg b/preseed.cfg index 2838d22..b594f5b 100644 --- a/preseed.cfg +++ b/preseed.cfg @@ -40,8 +40,8 @@ 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 +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 From 2e281752fb58561588ebf66c4b5b8d914cd30f56 Mon Sep 17 00:00:00 2001 From: Luca Capello Date: Wed, 7 Nov 2012 16:24:50 +0100 Subject: [PATCH 10/15] preseed.cfg: be consistent with static network configuration Set the default static network to the one libvirt defines as "Userspace SLIRP stack", which corresponds to the "-net user" option in QEMU. It thus reflects the value for mirror/http/hostname. --- preseed.cfg | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/preseed.cfg b/preseed.cfg index b594f5b..5079ee3 100644 --- a/preseed.cfg +++ b/preseed.cfg @@ -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 192.168.99.1 -d-i netcfg/get_ipaddress string 192.168.99.42 +d-i netcfg/get_nameservers string 10.0.2.3 +d-i netcfg/get_ipaddress string 10.0.2.99 d-i netcfg/get_netmask string 255.255.255.0 -d-i netcfg/get_gateway string 192.168.99.1 +d-i netcfg/get_gateway string 10.0.2.2 d-i netcfg/confirm_static boolean true # Any hostname and domain names assigned from dhcp take precedence over From 725d2e5d0ce8e9c61fbe2b92c1cd0e7e268fa7c3 Mon Sep 17 00:00:00 2001 From: Luca Capello Date: Wed, 7 Nov 2012 18:38:27 +0100 Subject: [PATCH 11/15] preseed.cfg: clock-setup/utc=true --- preseed.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/preseed.cfg b/preseed.cfg index 5079ee3..9920353 100644 --- a/preseed.cfg +++ b/preseed.cfg @@ -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 false +d-i clock-setup/utc boolean true # You may set this to any valid setting for $TZ; see the contents of # /usr/share/zoneinfo/ for valid values. From cc5dbbe97b8c18928063ee212c58f0126b98bb18 Mon Sep 17 00:00:00 2001 From: Luca Capello Date: Wed, 7 Nov 2012 18:52:41 +0100 Subject: [PATCH 12/15] babelbox-grub: be as much generic as possible --- babelbox-grub | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/babelbox-grub b/babelbox-grub index c93e63c..fc30411 100644 --- a/babelbox-grub +++ b/babelbox-grub @@ -2,7 +2,7 @@ menuentry 'BabelBox install' --class debian --class gnu-linux --class gnu --clas insmod part_msdos insmod ext2 set root='(hd0,1)' - echo 'Loading Linux 2.6.32-5-686 ...' + 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 echo 'Loading initial ramdisk ...' initrd /srv/initrd.gz @@ -12,9 +12,9 @@ menuentry 'BabelBox demo' --class debian --class gnu-linux --class gnu --class o insmod part_msdos insmod ext2 set root='(hd0,5)' - echo 'Loading Linux 2.6.32-5-686 ...' - linux /boot/vmlinuz-2.6.32-5-686 root=/dev/sda5 ro quiet + echo 'Loading Linux ...' + linux /vmlinuz root=/dev/sda5 ro quiet echo 'Loading initial ramdisk ...' - initrd /boot/initrd.img-2.6.32-5-686 + initrd /initrd.img } From 2c39e8f2848db633b8fffc799c35ee361d7fba31 Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Wed, 2 Mar 2016 20:56:02 +0100 Subject: [PATCH 13/15] Fix regular expressions to work with Jessie grub --- cronscript | 4 ++-- preseed_late | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cronscript b/cronscript index e7a4aae..ded6349 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/^set default=.*$/set default=\"2\"/" $ROOT/boot/grub/grub.cfg + s/^\([[:space:]]*\)set default=\"[[:digit:]]*\"$/\1set 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/preseed_late b/preseed_late index 326e4ac..e70889a 100755 --- a/preseed_late +++ b/preseed_late @@ -11,7 +11,7 @@ echo "@reboot root /root/cronscript; reboot" >>/target/etc/crontab mount /dev/discs/disc0/part1 /hd-media -o remount,rw -sed -i "s/^set default=.*$/set default=\"3\"/" /hd-media/boot/grub/grub.cfg +sed -i "s/^\([[:space:]]*\)set default=\"[[:digit:]]*\"$/\1set default=\"3\"/" /hd-media/boot/grub/grub.cfg if [ -d /target/etc/gdm3 ] ; then # Enable automatic login (chroot because of bug in busybox sed) From deec46d569589d2ff9a2fc5de399f867ec824e95 Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Wed, 2 Mar 2016 20:56:06 +0100 Subject: [PATCH 14/15] Fix typos to allow installation of Jessie --- preseed.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/preseed.cfg b/preseed.cfg index 9920353..eff667b 100644 --- a/preseed.cfg +++ b/preseed.cfg @@ -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 bollean true +d-i lilo-installer/skip boolean 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-teme, desktop-base, +d-i pkgsel/include string gdm3, gnome-session, gnome-icon-theme, desktop-base, xserver-xorg-core, xserver-xorg-input-evdev, xserver-xorg-video-vesa, xserver-xorg # Don't install popcon From 51e41766a84003a3ce81b29229e2989b3db2eab3 Mon Sep 17 00:00:00 2001 From: Alban VIDAL Date: Thu, 21 Mar 2019 05:31:08 +0100 Subject: [PATCH 15/15] Add readme file Signed-off-by: Alban VIDAL --- README.md | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..3c2943d --- /dev/null +++ b/README.md @@ -0,0 +1,11 @@ +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)