Setup mirror urls, s/tukaani/slefika/ so people don't get confuzed. Domen --- usr/lib/setup/FDhelp | 2 ++ usr/lib/setup/INSwget | 20 ++++++-------------- usr/lib/setup/SeTmodules | 1 + usr/lib/setup/SeTswap | 4 ++-- usr/lib/setup/mirrors.slackware | 2 ++ usr/lib/setup/mirrors.slefika | 1 + usr/lib/setup/mirrors.tukaani | 2 ++ usr/lib/setup/setup | 2 +- 8 files changed, 17 insertions(+), 17 deletions(-) Index: rootfs-slefika/usr/lib/setup/FDhelp =================================================================== --- rootfs-slefika.orig/usr/lib/setup/FDhelp +++ rootfs-slefika/usr/lib/setup/FDhelp @@ -3,6 +3,8 @@ TODO: The help text below is taken as is program of the Slackware Linux. It contains lots of good tips but unfortunately some parts do not match with the usage of the Tukaani Installer. +And now this is used for Slefika installer so if definitely +doesn't match in some areas. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * Index: rootfs-slefika/usr/lib/setup/INSwget =================================================================== --- rootfs-slefika.orig/usr/lib/setup/INSwget +++ rootfs-slefika/usr/lib/setup/INSwget @@ -40,28 +40,20 @@ E.g. ftp://myfavoritemirror.org/pub/slac # select which OS you want to install?-) while : ; do dialog --title "SELECT DISTRIBUTION" --menu \ - "The Tukaani Installer has a list of known mirrors of supported \ + "The Slefika Installer has a list of known mirrors of supported \ distribution versions. Select the distribution which you want to install \ and you will be presented a new menu showing the list of available mirrors. \ Another option is to select 'Custom' and enter the source URL manually." \ - 18 70 7 \ - "Tukaani Solid" "" \ - "Tukaani Edge" "" \ - "Slackware 10.0" "" \ - "Slackware 10.1" "" \ - "Slackware 10.2" "" \ - "Slackware Current" "" \ + 18 70 3 \ + "Slefika 12.0" "" \ + "Slefika 11.0" "" \ "Custom URL" "" \ 2> "$TMP/tmpanswer" [ $? != 0 ] && exit 1 DISTRO=$(cat "$TMP/tmpanswer") case "$DISTRO" in - 'Tukaani Solid') MIRROR_FILE=tukaani; MIRROR_SUFFIX=tukaani-solid/ ;; - 'Tukaani Edge') MIRROR_FILE=tukaani; MIRROR_SUFFIX=tukaani-edge/ ;; - 'Slackware 10.0') MIRROR_FILE=slackware; MIRROR_SUFFIX=slackware-10.0/ ;; - 'Slackware 10.1') MIRROR_FILE=slackware; MIRROR_SUFFIX=slackware-10.1/ ;; - 'Slackware 10.2') MIRROR_FILE=slackware; MIRROR_SUFFIX=slackware-10.2/ ;; - 'Slackware Current') MIRROR_FILE=slackware; MIRROR_SUFFIX=slackware-current/ ;; + 'Slefika 12.0') MIRROR_FILE=slefika; MIRROR_SUFFIX=slefika-12.0/ ;; + 'Slefika 11.0') MIRROR_FILE=slefika; MIRROR_SUFFIX=slefika-11.0/ ;; 'Custom URL') ask_custom || continue; exit 0 ;; *) continue ;; esac Index: rootfs-slefika/usr/lib/setup/SeTmodules =================================================================== --- rootfs-slefika.orig/usr/lib/setup/SeTmodules +++ rootfs-slefika/usr/lib/setup/SeTmodules @@ -1,3 +1,4 @@ +# Not used in Slefika, since we have everything in-kernel (at least in installer) #!/bin/sh # Requires /usr/lib/setup/modulelist. Index: rootfs-slefika/usr/lib/setup/SeTswap =================================================================== --- rootfs-slefika.orig/usr/lib/setup/SeTswap +++ rootfs-slefika/usr/lib/setup/SeTswap @@ -24,7 +24,7 @@ Do you want to continue installing witho else # there is at least one swap partition: echo > $TMP/swapmsg if [ "`echo "$SWAPLIST" | sed -n '2 p'`" = "" ]; then - echo "Tukaani Installer has detected a swap partition:" >> $TMP/swapmsg + echo "Slefika Installer has detected a swap partition:" >> $TMP/swapmsg echo >> $TMP/swapmsg echo " Device Boot Start End Blocks Id System\\n" >> $TMP/swapmsg echo "`echo "$SWAPLIST" | sed -n '1 p'`\\n" >> $TMP/swapmsg @@ -33,7 +33,7 @@ else # there is at least one swap partit dialog --title "SWAP SPACE DETECTED" --cr-wrap --yesno "`cat $TMP/swapmsg`" 12 72 REPLY=$? else - echo "Tukaani Installer has detected the following swap partitions:" >> $TMP/swapmsg + echo "Slefika Installer has detected the following swap partitions:" >> $TMP/swapmsg echo >> $TMP/swapmsg echo " Device Boot Start End Blocks Id System\\n" >> $TMP/swapmsg echo "$SWAPLIST\\n" >> $TMP/swapmsg Index: rootfs-slefika/usr/lib/setup/mirrors.slackware =================================================================== --- rootfs-slefika.orig/usr/lib/setup/mirrors.slackware +++ rootfs-slefika/usr/lib/setup/mirrors.slackware @@ -1,3 +1,5 @@ +# not used in Slefika + mirror.pacific.net.au "Australia (250Mbit)" http://mirror.pacific.net.au/linux/slackware/ \ ftp.planetmirror.com "Australia (155Mbit)" http://ftp.planetmirror.com/pub/slackware/ \ mirror.veridas.net "Australia (45mbit, 100Mbit)" ftp://mirror.veridas.net/pub/slackware/ \ Index: rootfs-slefika/usr/lib/setup/mirrors.slefika =================================================================== --- /dev/null +++ rootfs-slefika/usr/lib/setup/mirrors.slefika @@ -0,0 +1 @@ +slefika.coderock.org "USA" http://slefika.coderock.org/ \ Index: rootfs-slefika/usr/lib/setup/mirrors.tukaani =================================================================== --- rootfs-slefika.orig/usr/lib/setup/mirrors.tukaani +++ rootfs-slefika/usr/lib/setup/mirrors.tukaani @@ -1 +1,3 @@ +# not used in Slefika + tukaani.org "Finland (10 Mbps)" ftp://tukaani.org/tukaani/ \ Index: rootfs-slefika/usr/lib/setup/setup =================================================================== --- rootfs-slefika.orig/usr/lib/setup/setup +++ rootfs-slefika/usr/lib/setup/setup @@ -32,7 +32,7 @@ read foo read foo fi -DIALOGOPTS="--backtitle \"Tukaani Installer\"" +DIALOGOPTS="--backtitle \"Slefika Installer\"" export DIALOGOPTS TMP=/var/log/setup/tmp