Merge Debian version 1.157.4-1.
authorMichael Prokop <mika@grml.org>
Fri, 13 Nov 2009 17:50:50 +0000 (18:50 +0100)
committerMichael Prokop <mika@grml.org>
Fri, 13 Nov 2009 17:50:50 +0000 (18:50 +0100)
Makefile
contrib/languagelist
hooks/live
manpages/live-initramfs.en.7.txt
manpages/live-snapshot.en.1.txt
manpages/live-snapshot.it.1.txt
scripts/live
scripts/live-bottom/21xdriver
scripts/live-bottom/21xvidemode
scripts/live-functions

index e01ae9b..73bf2ba 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -113,15 +113,6 @@ uninstall:
        rm -f $(DESTDIR)/usr/share/man/man7/live-login.7.gz
 
 update:
-       set -e; for FILE in docs/parameters.txt; \
-       do \
-               sed -i  -e 's/2007\\-11\\-19/2007\\-11\\-26/' \
-                       -e 's/2007-11-19/2007-11-26/' \
-                       -e 's/19.11.2007/26.11.2007/' \
-                       -e 's/1.113.1/1.113.2/' \
-               $$FILE; \
-       done
-
        # Update language list
        wget -O "contrib/languagelist" \
                "http://svn.debian.org/viewsvn/*checkout*/d-i/trunk/packages/localechooser/languagelist"
index 2d2a4f1..bf15b46 100644 (file)
@@ -1,60 +1,63 @@
 #
 # This is the complete list of languages (locales) to choose from.
-# langcode;language (en);language (orig);supported_environments;countrycode;fallbacklocale;langlist;console-data
-sq;Albanian;Shqip;2;AL;sq_AL.UTF-8;;kbd=lat0-sun16(utf8)
+# langcode;language (en);language (orig);supported_environments;countrycode;fallbacklocale;langlist;console-setup
+sq;Albanian;Shqip;2;AL;sq_AL.UTF-8;;console-setup
 am;Amharic;አማርኛ;4;ET;am_ET;;
 ar;Arabic;عربي;3;EG;ar_EG.UTF-8;;console-setup
-eu;Basque;Euskaraz;1;ES;eu_ES.UTF-8;;kbd=lat0-sun16(utf8)
+ast;Asturian;Asturianu;2;ES;ast_ES.UTF-8;;console-setup
+eu;Basque;Euskara;1;ES;eu_ES.UTF-8;;console-setup
 be;Belarusian;Беларуская;2;BY;be_BY.UTF-8;;console-setup
 bn;Bengali;বাংলা;4;BD;bn_BD;;
-bs;Bosnian;Bosanski;2;BA;bs_BA.UTF-8;;kbd=Lat2-Terminus16(utf8)
+bs;Bosnian;Bosanski;2;BA;bs_BA.UTF-8;;console-setup
+#X br;Breton;Brezhoneg;2;FR;br_FR.UTF-8;;console-setup
 bg;Bulgarian;Български;2;BG;bg_BG.UTF-8;;console-setup
 # For C locale, set language to 'en' to make sure questions are "translated"
 # to English instead of showing codes.
 C;C;No localization;0;;C;en;
-ca;Catalan;Català;1;ES;ca_ES.UTF-8;;kbd=lat0-sun16(utf8)
+ca;Catalan;Català;1;ES;ca_ES.UTF-8;;console-setup
 # Special case for Chinese as the two flavours share the same ISO 639 code
 # Both will trigger countrychooser. Each will be the backup for the other
 # one
 zh_CN;Chinese (Simplified);中文(简体);3;CN;zh_CN.UTF-8;zh_CN:zh;
 zh_TW;Chinese (Traditional);中文(繁體);3;TW;zh_TW.UTF-8;zh_TW:zh;
-hr;Croatian;Hrvatski;2;HR;hr_HR.UTF-8;;kbd=lat2-sun16(utf8)
-cs;Czech;Čeština;2;CZ;cs_CZ.UTF-8;;kbd=lat2-sun16(utf8)
-da;Danish;Dansk;1;DK;da_DK.UTF-8;;kbd=lat0-sun16(utf8)
-nl;Dutch;Nederlands;1;NL;nl_NL.UTF-8;;kbd=lat0-sun16(utf8)
+hr;Croatian;Hrvatski;2;HR;hr_HR.UTF-8;;console-setup
+cs;Czech;Čeština;2;CZ;cs_CZ.UTF-8;;console-setup
+da;Danish;Dansk;1;DK;da_DK.UTF-8;;console-setup
+nl;Dutch;Nederlands;1;NL;nl_NL.UTF-8;;console-setup
 dz;Dzongkha;རྫོང་ཁ།;4;BT;dz_BT;;
-en;English;English;0;US;en_US.UTF-8;;kbd=lat0-sun16(utf8)
-# The Esperanto locale *is* (or will be as of 1/11/2006) eo.UTF-8
+en;English;English;0;US;en_US.UTF-8;;console-setup
+# The Esperanto locale is eo.UTF-8
 # so no country on purpose. The default country is Antarctica because...
 # ...why not..:-)
 eo;Esperanto;Esperanto;2;AQ;eo.UTF-8;;console-setup
-et;Estonian;Eesti;2;EE;et_EE.UTF-8;;kbd=lat0-sun16(utf8)
-fi;Finnish;Suomi;1;FI;fi_FI.UTF-8;;kbd=lat0-sun16(utf8)
+et;Estonian;Eesti;2;EE;et_EE.UTF-8;;console-setup
+fi;Finnish;Suomi;1;FI;fi_FI.UTF-8;;console-setup
 fr;French;Français;1;FR;fr_FR.UTF-8;;console-setup
-gl;Galician;Galego;1;ES;gl_ES.UTF-8;;kbd=lat0-sun16(utf8)
+gl;Galician;Galego;1;ES;gl_ES.UTF-8;;console-setup
 ka;Georgian;ქართული;4;GE;ka_GE.UTF-8;;console-setup
-de;German;Deutsch;1;DE;de_DE.UTF-8;;kbd=lat0-sun16(utf8)
+de;German;Deutsch;1;DE;de_DE.UTF-8;;console-setup
 el;Greek;Ελληνικά;2;GR;el_GR.UTF-8;;console-setup
 gu;Gujarati;ગુજરાતી;4;IN;gu_IN;;
 he;Hebrew;עברית;3;IL;he_IL.UTF-8;;console-setup
 hi;Hindi;हिन्दी ;4;IN;hi_IN;;
-hu;Hungarian;Magyar;2;HU;hu_HU.UTF-8;;kbd=lat2-sun16(utf8)
-#X is;Icelandic;Íslenska;1;IS;is_IS.UTF-8;;kbd=lat9u-16(utf8)
-id;Indonesian;Bahasa Indonesia;1;ID;id_ID.UTF-8;;kbd=lat0-sun16(utf8)
-#X ga;Irish;Gaeilge;1;IE;ga_IE.UTF-8;;kbd=lat0-sun16(utf8)
-it;Italian;Italiano;1;IT;it_IT.UTF-8;;kbd=lat0-sun16(utf8)
+hu;Hungarian;Magyar;2;HU;hu_HU.UTF-8;;console-setup
+#X is;Icelandic;Íslenska;1;IS;is_IS.UTF-8;;console-setup
+id;Indonesian;Bahasa Indonesia;1;ID;id_ID.UTF-8;;console-setup
+ga;Irish;Gaeilge;1;IE;ga_IE.UTF-8;;console-setup
+it;Italian;Italiano;1;IT;it_IT.UTF-8;;console-setup
 ja;Japanese;日本語;3;JP;ja_JP.UTF-8;;
 #X kn;Kannada;ಕನ್ನಡ;4;IN;kn_IN;;
 #X ks;Kashmiri;कोशुर;4;IN;ks_IN;;
-#X kk;Kazakh;Қазақ;2;KZ;kk_KZ.UTF-8;;console-setup
+kk;Kazakh;Қазақ;2;KZ;kk_KZ.UTF-8;;console-setup
 km;Khmer;ខ្មែរ;4;KH;km_KH;;
 ko;Korean;한국어;3;KR;ko_KR.UTF-8;;
-ku;Kurdish;Kurdî;2;TR;ku_TR.UTF-8;;kbd=Lat15-Terminus16(utf8)
+ku;Kurdish;Kurdî;2;TR;ku_TR.UTF-8;;console-setup
+#X ky;Kirghiz;Кыргызча;2;KG;ky_KG;;console-setup
 #X lo;Lao;ລາວ;4;LA;lo_LA;;console-setup
-lv;Latvian;Latviski;2;LV;lv_LV.UTF-8;;kbd=lat7-14(utf8)
-lt;Lithuanian;Lietuviškai;2;LT;lt_LT.UTF-8;;kbd=LatArCyrHeb-16(utf8)
-#X mg;Malagasy;Malagasy;1;MG;mg_MG.UTF-8;mg_MG:fr_FR:fr:en;kbd=lat0-sun16(utf8)
-#X ms;Malay;Bahasa Malaysia;1;MY;ms_MY.UTF-8;;kbd=lat0-sun16(utf8)
+lv;Latvian;Latviski;2;LV;lv_LV.UTF-8;;console-setup
+lt;Lithuanian;Lietuviškai;2;LT;lt_LT.UTF-8;;console-setup
+#X mg;Malagasy;Malagasy;1;MG;mg_MG.UTF-8;mg_MG:fr_FR:fr:en;console-setup
+#X ms;Malay;Bahasa Malaysia;1;MY;ms_MY.UTF-8;;console-setup
 ml;Malayalam;മലയാളഠ;4;IN;ml_IN;;
 mr;Marathi;मराठी;4;IN;mr_IN;;
 mk;Macedonian;Македонски;2;MK;mk_MK.UTF-8;;console-setup
@@ -62,32 +65,32 @@ ne;Nepali;नेपाली ;4;NP;ne_NP;;
 # The Sami translation is really incomplete. We however keep Sami on request
 # of Skolelinux as a kind of reward to them..:-). They need to be able to
 # choose Sami as an option so that the Sami locale is set as default
-se_NO;Northern Sami;Sámegillii;1;NO;se_NO.UTF-8;se_NO:nb_NO:nb:no_NO:no:nn_NO:nn:da:sv:en;kbd=lat0-sun(utf8)
-nb_NO;Norwegian Bokmaal;Norsk bokmål;1;NO;nb_NO.UTF-8;nb_NO:nb:no_NO:no:nn_NO:nn:da:sv:en;kbd=lat0-sun16(utf8)
-nn_NO;Norwegian Nynorsk;Norsk nynorsk;1;NO;nn_NO.UTF-8;nn_NO:nn:no_NO:no:nb_NO:nb:da:sv:en;kbd=lat0-sun16(utf8)
+se_NO;Northern Sami;Sámegillii;1;NO;se_NO.UTF-8;se_NO:nb_NO:nb:no_NO:no:nn_NO:nn:da:sv:en;console-setup
+nb_NO;Norwegian Bokmaal;Norsk bokmål;1;NO;nb_NO.UTF-8;nb_NO:nb:no_NO:no:nn_NO:nn:da:sv:en;console-setup
+nn_NO;Norwegian Nynorsk;Norsk nynorsk;1;NO;nn_NO.UTF-8;nn_NO:nn:no_NO:no:nb_NO:nb:da:sv:en;console-setup
 #X fa;Persian;فارسی;3;IR;fa_IR;;console-setup
-pl;Polish;Polski;2;PL;pl_PL.UTF-8;;kbd=lat2-sun16(utf8)
-pt;Portuguese;Português;1;PT;pt_PT.UTF-8;pt:pt_BR:en;kbd=lat0-sun16(utf8)
-pt_BR;Portuguese (Brazil);Português do Brasil;1;BR;pt_BR.UTF-8;pt_BR:pt:en;kbd=lat1-16(utf8)
+pl;Polish;Polski;2;PL;pl_PL.UTF-8;;console-setup
+pt;Portuguese;Português;1;PT;pt_PT.UTF-8;pt:pt_BR:en;console-setup
+pt_BR;Portuguese (Brazil);Português do Brasil;1;BR;pt_BR.UTF-8;pt_BR:pt:en;console-setup
 pa;Punjabi (Gurmukhi);ਪੰਜਾਬੀ;4;IN;pa_IN;;
-ro;Romanian;Română;2;RO;ro_RO.UTF-8;;kbd=Lat2-Terminus16(utf8)
+ro;Romanian;Română;2;RO;ro_RO.UTF-8;;console-setup
 ru;Russian;Русский;2;RU;ru_RU.UTF-8;;console-setup
 #X sa;Sanskrit;संस्कृत;4;IN;sa_IN;;
-# Serbian commented for consistency: too incomplete
-#X sr;Serbian;Српски;2;CS;sr_YU.UTF-8@cyrillic;;console-setup
-sk;Slovak;Slovenčina;2;SK;sk_SK.UTF-8;;kbd=lat2-sun16(utf8)
-sl;Slovenian;Slovenščina;2;SI;sl_SI.UTF-8;;kbd=lat2-sun16(utf8)
-es;Spanish;Español;1;ES;es_ES.UTF-8;;kbd=lat0-sun16(utf8)
-sv;Swedish;Svenska;1;SE;sv_SE.UTF-8;;kbd=lat0-sun16(utf8)
-tl;Tagalog;Tagalog;1;PH;tl_PH.UTF-8;;kbd=lat0-sun16(utf8)
+#X si;Sinhala;සිංහල;4;IN;si_IN;;
+sr;Serbian;Српски;2;RS;sr_RS;;console-setup
+sk;Slovak;Slovenčina;2;SK;sk_SK.UTF-8;;console-setup
+sl;Slovenian;Slovenščina;2;SI;sl_SI.UTF-8;;console-setup
+es;Spanish;Español;1;ES;es_ES.UTF-8;;console-setup
+sv;Swedish;Svenska;1;SE;sv_SE.UTF-8;;console-setup
+tl;Tagalog;Tagalog;1;PH;tl_PH.UTF-8;;console-setup
 ta;Tamil;தமிழ்;4;IN;ta_IN;;
 #X te;Telugu;తెలుగు;4;IN;te_IN;;
 th;Thai;ภาษาไทย;4;TH;th_TH.UTF-8;;console-setup
-tr;Turkish;Türkçe;2;TR;tr_TR.UTF-8;;kbd=Lat15-Terminus16(utf8)
+tr;Turkish;Türkçe;2;TR;tr_TR.UTF-8;;console-setup
 uk;Ukrainian;Українська;2;UA;uk_UA.UTF-8;;console-setup
 #X ur;Urdu;اردو;3;PK;ur_PK.UTF-8;;console-setup
-#X ca@valencia;Valencian-Catalan;Valencià-Català;1;ES;ca_ES.UTF-8@valencia;;kbd=lat0-sun16(utf8)
-vi;Vietnamese;Tiếng Việt;3;VN;vi_VN.UTF-8;;console-setup
-#X cy;Welsh;Cymraeg;2;GB;cy_GB.UTF-8;;kbd=iso14.f16(utf8)
+#X ca@valencia;Valencian-Catalan;Valencià-Català;1;ES;ca_ES.UTF-8@valencia;;console-setup
+vi;Vietnamese;Tiếng Việt;3;VN;vi_VN;;console-setup
+cy;Welsh;Cymraeg;2;GB;cy_GB.UTF-8;;console-setup
 wo;Wolof;Wolof;2;SN;wo_SN;wo:fr:en;
-#X xh;Xhosa;Xhosa;2;ZA;xh_ZA.UTF-8;;kbd=lat0-sun16(utf8)
+#X xh;Xhosa;Xhosa;2;ZA;xh_ZA.UTF-8;;console-setup
index 4e29226..d78da1e 100755 (executable)
@@ -35,6 +35,9 @@ then
        cp /etc/live.conf "${DESTDIR}"/etc
 fi
 
+mkdir -p "${DESTDIR}"/usr/share/live-initramfs
+cp /usr/share/live-initramfs/languagelist "${DESTDIR}"/usr/share/live-initramfs
+
 # Directories
 mkdir -p "${DESTDIR}"/lib/live-initramfs
 
@@ -55,6 +58,16 @@ do
        fi
 done
 
+# udev dependencies (squeeze and newer)
+for FILE in /lib/udev/*_id
+do
+       if [ ! -e "${DESTDIR}/${FILE}" ]
+       then
+               mkdir -p "${DESTDIR}/lib/udev"
+               copy_exec "${FILE}" /lib/udev
+       fi
+done
+
 # Handling other stuff
 
 # Configuration: keymap (usefull when using encryption)
index b7ffa11..4a70f27 100644 (file)
@@ -1,5 +1,7 @@
 live-initramfs(7)
 =================
+:man source: 1.157.3
+:man manual: Debian Live
 
 Name
 ----
index 4f53e7e..da5d27d 100644 (file)
@@ -1,5 +1,7 @@
 live-snapshot(1)
 ================
+:man source: 1.157.3
+:man manual: Debian Live
 
 Name
 ----
index 1beb791..2370de7 100644 (file)
@@ -1,5 +1,7 @@
 live-snapshot(1)
 ================
+:man source: 1.157.3
+:man manual: Debian Live
 
 Name
 ----
index db1d355..ab2db29 100755 (executable)
@@ -71,6 +71,11 @@ Arguments ()
                                 export FETCH
                                 ;;
 
+                       forcepersistentfsck)
+                               FORCEPERSISTENTFSCK="Yes"
+                               export FORCEPERSISTENTFSCK
+                               ;;
+
                        hook=*)
                                HOOK="${ARGUMENT#hook=}"
                                export HOOK
@@ -625,7 +630,7 @@ copy_live_to ()
 
        if [ -z "${MODULETORAM}" ]
        then
-               size=$(fs_size "" ${copyfrom} "used")
+               size=$(fs_size "" ${copyfrom}/${LIVE_MEDIA_PATH} "used")
        else
                MODULETORAMFILE="${copyfrom}/${LIVE_MEDIA_PATH}/${MODULETORAM}"
 
@@ -683,7 +688,8 @@ copy_live_to ()
                then
                        cp ${MODULETORAMFILE} ${copyto} # copy only the filesystem module
                else
-                       cp -a ${copyfrom}/* ${copyto}   # "cp -a" from busybox also copies hidden files
+                       mkdir -p ${copyto}/${LIVE_MEDIA_PATH}
+                       cp -a ${copyfrom}/${LIVE_MEDIA_PATH}/* ${copyto}/${LIVE_MEDIA_PATH}   # "cp -a" from busybox also copies hidden files
                fi
 
                umount ${copyfrom}
@@ -1228,6 +1234,11 @@ setup_unionfs ()
                        cowdevice=${cowprobe}
                        cow_fstype=$(get_fstype "${cowprobe}")
                        cow_mountopt="rw,noatime"
+
+                       if [ "${FORCEPERSISTENTFSCK}" = "Yes" ]
+                       then
+                               fsck -y ${cowdevice}
+                       fi
                else
                        log_warning_msg "Unable to find the persistent medium"
                        cowdevice="tmpfs"
index 105f5b2..e86c310 100755 (executable)
@@ -37,11 +37,16 @@ mount -o bind /sys /root/sys
 mount -o bind /proc /root/proc
 mount -o bind /dev /root/dev
 
+if [ "${XDRIVER}" != "dexconf" ]
+then
+
 chroot /root debconf-communicate -fnoninteractive live-initramfs > /dev/null << EOF
 set xserver-xorg/autodetect_video_card false
 set xserver-xorg/config/device/driver ${XDRIVER}
 EOF
 
+fi
+
 chroot /root dexconf
 
 umount /root/sys
index 489fc5c..1312530 100755 (executable)
@@ -40,6 +40,13 @@ log_begin_msg "Configuring X video modes"
 
 . /live.vars
 
+if [ "${XVIDEOMODE}" = "auto" ]
+then
+       rm -f /root/etc/X11/Xsession.d/21xvidemode
+
+       exit 0
+fi
+
 if [ $(cat /root/etc/debian_version | sed 's|\..*$||') -ge 4 ]
 then
        # lenny or newer
index 8bf9c38..4a23e69 100644 (file)
@@ -35,7 +35,7 @@ lang2locale() {
        langpart="${1%%_*}"
        if [ "$1" != "C" ]; then
                # Match the language code with 3rd field in languagelist
-               line=$(grep -v "^#" /root/usr/share/live-initramfs/languagelist | cut -f3,4,5 -d\; | grep -v ';C$' | grep "^$langpart;")
+               line=$(grep -v "^#" /usr/share/live-initramfs/languagelist | cut -f1,3,6 -d\; | grep -v ';C$' | grep "^$langpart;")
                if [ -n "$line" ]; then
                        if [ "$(echo "$line" | grep -c '')" -gt 1 ]; then
                                # More than one match; try matching the