X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai%2Fconfig%2Fscripts%2FUBUNTU%2F90-apt;h=682d572b351e4331ca4d8ffe62659a88b4942c0c;hb=53db7c23cb11661c98a08d69295bb315c392003b;hp=15ac4bb7bfd60a8fc20a635f1cedd9525417f55d;hpb=f8e7e925a0eba5b0091354ccf26842bcfda9b84e;p=automated-distro-installer diff --git a/fai/config/scripts/UBUNTU/90-apt b/fai/config/scripts/UBUNTU/90-apt index 15ac4bb..682d572 100755 --- a/fai/config/scripts/UBUNTU/90-apt +++ b/fai/config/scripts/UBUNTU/90-apt @@ -1,20 +1,7 @@ #! /bin/bash -if ifclass GERMAN; then - $ROOTCMD locale-gen LANG=de_DE.UTF-8 - $ROOTCMD update-locale LANG=de_DE.UTF-8 -else - ainsl -v /etc/locale.gen '^en_US.UTF-8 UTF-8' - $ROOTCMD locale-gen - $ROOTCMD update-locale LANG=en_US.UTF-8 -fi +# ian: just taking part of the corresponding fai example script -# check if we already use an external mirror -grep -q "external mirror" $target/etc/apt/sources.list && exit 0 - -cat < $target/etc/apt/sources.list -# external mirror -deb $ubuntumirror/ubuntu $ubuntudist main restricted universe multiverse -deb $ubuntumirror/ubuntu $ubuntudist-updates main restricted universe multiverse -deb $ubuntumirror/ubuntu $ubuntudist-security main restricted universe multiverse -EOM +ainsl -v /etc/locale.gen '^en_US.UTF-8 UTF-8' +$ROOTCMD locale-gen +$ROOTCMD update-locale LANG=en_US.UTF-8