QubesOS/qubes-linux-template-builder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

debian: move keyboard layout setting earlier

Browse Source 
As the keyboard-configuration package is installed earlier now.
This commit is contained in:
Marek Marczykowski-Górecki 2014-07-28 18:54:52 +02:00
parent 000b26c06e
commit b489770955
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
scripts_debian/02_install_groups.sh
View File

@ -37,6 +37,17 @@ echo "--> Upgrading system"
chroot $INSTALLDIR apt-get update chroot $INSTALLDIR apt-get update
chroot $INSTALLDIR apt-get -y upgrade chroot $INSTALLDIR apt-get -y upgrade
echo "--> Setting keyboard layout"
chroot $INSTALLDIR debconf-set-selections <<EOF
keyboard-configuration keyboard-configuration/variant select English (US)
keyboard-configuration keyboard-configuration/layout select English (US)
keyboard-configuration keyboard-configuration/model select Generic 105-key (Intl) PC
keyboard-configuration keyboard-configuration/modelcode string pc105
keyboard-configuration keyboard-configuration/layoutcode string us
keyboard-configuration keyboard-configuration/variantcode string
keyboard-configuration keyboard-configuration/optionscode string
EOF
echo "--> Installing extra packages" echo "--> Installing extra packages"
xargs chroot $INSTALLDIR apt-get -y install < $SCRIPTSDIR/packages.list xargs chroot $INSTALLDIR apt-get -y install < $SCRIPTSDIR/packages.list

11
scripts_debian/04_install_qubes.sh
View File

@ -63,17 +63,6 @@ deb file:/tmp/qubes_repo $DEBIANVERSION main
EOF EOF
cp $CACHEDIR/repo-pubring.gpg $INSTALLDIR/etc/apt/trusted.gpg.d/qubes-builder.gpg cp $CACHEDIR/repo-pubring.gpg $INSTALLDIR/etc/apt/trusted.gpg.d/qubes-builder.gpg
# configure keyboard layout
chroot $INSTALLDIR debconf-set-selections <<EOF
keyboard-configuration keyboard-configuration/variant select English (US)
keyboard-configuration keyboard-configuration/layout select English (US)
keyboard-configuration keyboard-configuration/model select Generic 105-key (Intl) PC
keyboard-configuration keyboard-configuration/modelcode string pc105
keyboard-configuration keyboard-configuration/layoutcode string us
keyboard-configuration keyboard-configuration/variantcode string
keyboard-configuration keyboard-configuration/optionscode string
EOF
chroot $INSTALLDIR apt-get update || { umount $INSTALLDIR/tmp/qubes_repo; exit 1; } chroot $INSTALLDIR apt-get update || { umount $INSTALLDIR/tmp/qubes_repo; exit 1; }
chroot $INSTALLDIR apt-get -y install `cat $SCRIPTSDIR/packages_qubes.list` || { umount $INSTALLDIR/tmp/qubes_repo; exit 1; } chroot $INSTALLDIR apt-get -y install `cat $SCRIPTSDIR/packages_qubes.list` || { umount $INSTALLDIR/tmp/qubes_repo; exit 1; }
umount $INSTALLDIR/tmp/qubes_repo umount $INSTALLDIR/tmp/qubes_repo