From 86b9d8034c7ce3a401a5d5cc26a483204e551b89 Mon Sep 17 00:00:00 2001 From: Luca Capello Date: Tue, 3 Jul 2012 16:47:14 -0600 Subject: [PATCH] import babelbox-lenny.tgz (thanks, fjp) SHA-1:d91fae337f77367399a10841b1903b615f388955, from --- atomic_scheme.txt | 61 ------------------- babelbox-grub | 4 +- babelbox-template | 4 -- cronscript | 2 - localize-preseed | 27 --------- babelbox-preseed.cfg => preseed.cfg | 39 +++--------- use_biggest_free.txt | 61 ------------------- xorg.conf | 93 +++-------------------------- 8 files changed, 16 insertions(+), 275 deletions(-) delete mode 100644 atomic_scheme.txt delete mode 100644 babelbox-template delete mode 100755 localize-preseed rename babelbox-preseed.cfg => preseed.cfg (65%) delete mode 100644 use_biggest_free.txt diff --git a/atomic_scheme.txt b/atomic_scheme.txt deleted file mode 100644 index 5933bd3..0000000 --- a/atomic_scheme.txt +++ /dev/null @@ -1,61 +0,0 @@ -Template: partman-auto/text/atomic_scheme -Type: text -Description: All files in one partition (recommended for new users) -Description-ar.UTF-8: جميع الملفّات في جزء واحد (ينصح به للمستخدمين الجدد) -Description-be.UTF-8: Усе файлы на адным падзеле (рэкамендуецца) -Description-bg.UTF-8: Всички файлове в един дял (препоръчително за нови потребители) -Description-bn.UTF-8: এক পার্টিশনে সব ফাইল (নতুন ব্যবহারকারীর জন্য সুপারিশকৃত) -Description-bs.UTF-8: Sve datoteke na jednoj particiji (preporučuje se novim korisnicima) -Description-ca.UTF-8: Tots els fitxers en una partició (recomanat per a nous usuaris) -Description-cs.UTF-8: Všechny soubory v jedné oblasti (doporučeno pro začátečníky) -Description-da.UTF-8: Alle filer i én partition (anbefales for nye brugere) -Description-de.UTF-8: Alle Dateien auf eine Partition (für Anfänger empf.) -Description-dz.UTF-8: ཡིག་སྣོད་ཚུ་ཆ་མཉམ་བར་བཅད་གཅིག་ནང་(ལག་ལེན་པ་གསརཔ་ཚུ་ལུ་འོས་སྦྱོར་འབད་ཡོདཔ་) -Description-el.UTF-8: Όλα τα αρχεία στην ίδια κατάτμηση (συνίσταται για νέους χρήστες) -Description-eo.UTF-8: Ĉiujn dosierojn en unua diskpartigo (rekomendita) -Description-es.UTF-8: Todos los ficheros en una partición (recomendado para novatos) -Description-et.UTF-8: Kõik failid ühel partitsioonil (soovitatav uutele kasutajatele) -Description-eu.UTF-8: Fitxategiak partizio batean (erabiltzaile berrientzat gomendatua) -Description-fi.UTF-8: Vain yksi levyosio (suositellaan uusille käyttäjille) -Description-fr.UTF-8: Tout dans une seule partition (recommandé pour les débutants) -Description-gl.UTF-8: Todo nunha partición (recomendado para novos usuarios) -Description-gu.UTF-8: એક પાર્ટિશનમાં બધીજ ફાઇલો (નવા વપરાશકર્તાઓ માટે સલાહભર્યુ) -Description-he.UTF-8: כל הקבצים במחיצה אחת (מומלץ למשתמשים חדשים) -Description-hi.UTF-8: एक पार्टीशन में सभी फ़ाइलें (नए उपयोक्ताओं के लिए अनुसंशित) -Description-hr.UTF-8: Sve datoteke na jednoj particiji (preporučeno za novake) -Description-hu.UTF-8: Minden fájl egyetlen partícióra (új felhasználóknak) -Description-id.UTF-8: Semua berkas di satu partisi (disarankan untuk pemula) -Description-it.UTF-8: Tutti i file in una partizione (raccomandata per nuovi utenti) -Description-ja.UTF-8: すべてのファイルを 1 つのパーティションに (初心者ユーザには推奨) -Description-ka.UTF-8: ყველა ფაილი ერთ დანაყოფში (ახალ მომხმარებელთათვის) -Description-km.UTF-8: ឯកសារ​ទាំងអស់​ក្នុង​​ភាគថាសមួយ (ផ្ដល់​អនុសាសន៍​សម្រាប់​អ្នក​ប្រើថ្មី) -Description-ko.UTF-8: 모두 한 파티션에 설치하기 (처음 사용하는 경우 추천) -Description-ku.UTF-8: Hemû pelan di partîsiyonekê de (ji bo bikarhênerên nû tê tawsiye kirin) -Description-lt.UTF-8: Visi failai viename disko skirsnyje (rekomenduojama naujiems naudotojams) -Description-lv.UTF-8: Visi faili vienā partīcijā (jauniem lietotājiem) -Description-mk.UTF-8: Сите датотеки во една партиција (препорачливо за нови кориситници) -Description-ml.UTF-8: എല്ലാ ഫയലുകളും ഒറ്റ ഭാഗത്ത്(പുതിയ ഉപയോക്താക്കള്ക്ക് ശുപാര്ശ ചെയ്തിരിക്കുന്നു) -Description-nb.UTF-8: Alle filene på en partisjon (anbefales for nye brukere) -Description-ne.UTF-8: एउटा विभाजनमा सबै फाइलहरू ( नयाँ प्रयोगकर्ताका लागि सिफारिस) -Description-nl.UTF-8: Alles in één partitie (aanbevolen voor nieuwe gebruikers) -Description-nn.UTF-8: Alle filer på ein partisjon (tilrådd for nye brukarar) -Description-no.UTF-8: Alle filene på en partisjon (anbefales for nye brukere) -Description-pa.UTF-8: ਇੱਕ ਭਾਗ ਵਿੱਚ ਸਾਰੀਆਂ ਫਾਇਲਾਂ (ਨਵੇਂ ਉਪਭੋਗੀਆਂ ਲਈ ਉਦੇਸ਼ਿਤ ਹਨ) -Description-pl.UTF-8: Wszystko na jednej partycji (zalecane dla nowych użytkowników) -Description-pt.UTF-8: Todos os ficheiros numa partição (recomendado a novos utilizadores) -Description-pt_BR.UTF-8: Todos os arquivos em uma única partição (para iniciantes) -Description-ro.UTF-8: Toate fişierele pe o partiţie (recomandat pentru utilizatori începători) -Description-ru.UTF-8: Все файлы в одном разделе (рекомендуется новичкам) -Description-sk.UTF-8: Všetky súbory na jednej oblasti (pre začiatočníkov) -Description-sl.UTF-8: Vse datoteke v enem razdelku (priporočeno za nove upor.) -Description-sq.UTF-8: Gjithçka në një ndarje (e këshillueshme për përdoruesit e rinj) -Description-sv.UTF-8: Alla filer på en partition (rekommenderas för nya användare) -Description-ta.UTF-8: அனைத்து கோப்புகளையும் ஒரே பகிர்வில் இடு (புதிய பயனர்களுக்கு உகந்தது) -Description-th.UTF-8: ทุกแฟ้มในพาร์ทิชันเดียว (แนะนำสำหรับผู้ใช้ใหม่) -Description-tl.UTF-8: Lahat ng mga talaksan sa iisang partisyon (mungkahi ito sa baguhan) -Description-tr.UTF-8: Tüm dosyalar tek bölümde (yeni kullanıcılar için önerilir) -Description-uk.UTF-8: Всі файли в одному розділі (рекомендується для новаків) -Description-vi.UTF-8: Mọi tập tin trên một phân vùng (khuyên cho người dùng mới) -Description-wo.UTF-8: Fiise yéppu ci benn partisoŋ (moom la ñuy deŋk ñiy doora tambule) -Description-zh_CN.UTF-8: 将所有文件放在同一个分区中 (推荐新手使用) -Description-zh_TW.UTF-8: 把所有的檔案全部放到同一個分割區中 (新手推介) diff --git a/babelbox-grub b/babelbox-grub index 99997df..7a64574 100644 --- a/babelbox-grub +++ b/babelbox-grub @@ -8,7 +8,7 @@ boot title Babelbox demo root (hd0,4) -kernel /boot/vmlinuz-2.6.18-4-686 root=/dev/sda5 ro quiet -initrd /boot/initrd.img-2.6.18-4-686 +kernel /boot/vmlinuz-2.6.26-1-686 root=/dev/sda5 ro quiet +initrd /boot/initrd.img-2.6.26-1-686 savedefault boot diff --git a/babelbox-template b/babelbox-template deleted file mode 100644 index e99ba17..0000000 --- a/babelbox-template +++ /dev/null @@ -1,4 +0,0 @@ - -Template: babelbox/info -Type: title -Description: Demo ${LANGNAME} diff --git a/cronscript b/cronscript index ab84fd7..4b4df61 100755 --- a/cronscript +++ b/cronscript @@ -36,8 +36,6 @@ LOCALE=$(echo "$LANG" | cut -d: -f1) LANGNAME=$(echo "$LANG" | cut -d: -f3) GRUBLINE=$(echo "$LANG" | cut -d: -f4) -./localize-preseed $LOCALE - sed -i "s/LANGNAME \".*\"/LANGNAME \"$LANGNAME\"/" preseed_early sed -i "s/locale=.*$/locale=$LOCALE $GRUBLINE/ diff --git a/localize-preseed b/localize-preseed deleted file mode 100755 index 19d600a..0000000 --- a/localize-preseed +++ /dev/null @@ -1,27 +0,0 @@ -#! /bin/sh - -cp babelbox-preseed.cfg preseed.cfg - -get_trans () { - for LANG in $1 ${1%%_*} ; do - if [ "$LANG" = "en" ] ; then - REGEXP="^Description:" - else - REGEXP="^Description-$LANG[^_]*:" - fi - DESCR=$(grep "$REGEXP" $TEMPLATE.txt | sed "s/^.*: //") - if [ -n "$DESCR" ] ; then - echo $DESCR - break - fi - done -} - -for TEMPLATE in use_biggest_free atomic_scheme; do - TRANS=$(get_trans $1) - if [ -z "$TRANS" ] ; then - exit 1 - else - sed -i "s@%%$TEMPLATE%%@$TRANS@" preseed.cfg - fi -done diff --git a/babelbox-preseed.cfg b/preseed.cfg similarity index 65% rename from babelbox-preseed.cfg rename to preseed.cfg index 7a85abf..9a36f80 100644 --- a/babelbox-preseed.cfg +++ b/preseed.cfg @@ -1,5 +1,5 @@ #### Preseed file for Babelbox -# See installation guide for other preconfiguration options +# See the Installation Guide for other preconfiguration options ### Network configuration # netcfg will choose an interface that has link if possible. This makes it @@ -38,17 +38,13 @@ d-i mirror/http/directory string /debian d-i mirror/http/proxy string ### Partitioning -# We use the largest free space available for Babelbox -#d-i partman-auto/init_automatically_partition \ -# select Use the largest continuous free space -d-i partman-auto/init_automatically_partition select %%use_biggest_free%% - -# You can choose from any of the predefined partitioning recipes: -# d-i partman-auto/choose_recipe select All files in one partition (recommended for new users) -d-i partman-auto/choose_recipe select %%atomic_scheme%% +# 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 # This makes partman automatically partition without confirmation. -d-i partman/choose_partition select Finish partitioning and write changes to disk +d-i partman/choose_partition select finish d-i partman/confirm boolean true ### Clock and time zone setup @@ -84,8 +80,7 @@ d-i grub-installer/only_debian boolean false d-i grub-installer/with_other_os boolean false ### Package selection -#tasksel tasksel/first multiselect Standard system -tasksel tasksel/first multiselect Standard system, Desktop environment +tasksel tasksel/first multiselect standard, desktop # Don't install popcon popularity-contest popularity-contest/participate boolean false @@ -94,26 +89,6 @@ popularity-contest popularity-contest/participate boolean false # Avoid that last message about the install being complete. d-i finish-install/reboot_in_progress note -### X configuration -# X can detect the right driver for some cards, but if you're preseeding, -# you override whatever it chooses. Still, vesa will work most places. -#xserver-xorg xserver-xorg/config/device/driver select vesa - -# A caveat with mouse autodetection is that if it fails, X will retry it -# over and over. So if it's preseeded to be done, there is a possibility of -# an infinite loop if the mouse is not autodetected. -#xserver-xorg xserver-xorg/autodetect_mouse boolean true - -# Monitor autodetection is recommended. -xserver-xorg xserver-xorg/autodetect_monitor boolean true -# Uncomment if you have an LCD display. -#xserver-xorg xserver-xorg/config/monitor/lcd boolean true -# X has three configuration paths for the monitor. Here's how to preseed -# the "medium" path, which is always available. The "simple" path may not -# be available, and the "advanced" path asks too many questions. -#xserver-xorg xserver-xorg/config/monitor/selection-method select medium -d-i xserver-xorg/config/display/modes multiselect 1024x768, 800x600, 720x400, 640x480 - #### Advanced options ### Define scripts to be run diff --git a/use_biggest_free.txt b/use_biggest_free.txt deleted file mode 100644 index a86c74f..0000000 --- a/use_biggest_free.txt +++ /dev/null @@ -1,61 +0,0 @@ -Template: partman-auto/text/use_biggest_free -Type: text -Description: Guided - use the largest continuous free space -Description-ar.UTF-8: موجّه - استخدام أكبر مساحة متاحة متواصلة -Description-be.UTF-8: З падказкай - ужыць найбольш працяглае вольнае месца -Description-bg.UTF-8: Автоматично - използване на най-голямото свободно място -Description-bn.UTF-8: সহায়তা নিয়ে - বৃহত্তম ধারাবাহিক মুক্ত স্থান ব্যবহার করো -Description-bs.UTF-8: Vođeno - koristi najveći neprekidni slobodni prostor -Description-ca.UTF-8: Guiat - utilitza l'espai lliure continu més gran -Description-cs.UTF-8: Asistované - použít největší spojité volné místo -Description-da.UTF-8: Guidet - benyt den største sammenhængende fri plads -Description-de.UTF-8: Geführt - den größten freien Speicherbereich benutzen -Description-dz.UTF-8: ལམ་སྟོན་ཅན་ - འཕྲོ་མཐུད་ཅན་གྱི་ བར་སྟོང་རིང་ཤོས་དེ་ལག་ལེན་འཐབ། -Description-el.UTF-8: Καθοδηγούμενη διαμέριση - χρήση του μεγαλύτερου συνεχούς ελεύθερου χώρου -Description-eo.UTF-8: Gvidata - uzu la plejampleksan disponeblan interspacon -Description-es.UTF-8: Guiado - utilizar el espacio libre contiguo más grande -Description-et.UTF-8: Juhitud - kasutada pikim järjestikkuline vaba ala -Description-eu.UTF-8: Gidatua - erabili leku libre jarraitu handiena -Description-fi.UTF-8: Ohjattu - käytä suurinta yhtenäistä vapaata tilaa -Description-fr.UTF-8: Assisté - utiliser le plus grand espace disponible -Description-gl.UTF-8: Guiado - empregar o espazo libre contiguo máis grande -Description-gu.UTF-8: માર્ગદર્શક - મહત્તમ સળંગ ખાલી જગ્યા વાપરો -Description-he.UTF-8: הדרכה - השתמש בנפח הדיסק הפנוי הרציף הכי גדול -Description-hi.UTF-8: दिग्दर्शित - सबसे बड़ा लगातार मुक्त स्थान का प्रयोग करें -Description-hr.UTF-8: Poluautomatsko - na najvećem komadu slobodnog prostora -Description-hu.UTF-8: Irányított - a legnagyobb összefüggő szabad helyre -Description-id.UTF-8: Terpandu - gunakan area kosong terbesar yang kontinu. -Description-it.UTF-8: Guidato - usare il più ampio spazio contiguo disponibile. -Description-ja.UTF-8: ガイド - 最大の連続空き領域を使う -Description-ka.UTF-8: ოსტატი - უდიდესი უწყვ. სივრცის გამოყენება -Description-km.UTF-8: បានណែនាំ - ប្រើ​ទំហំ​ទំនេរ​បន្ត​ធំ​ជាង​គេ​បំផុត -Description-ko.UTF-8: 자동 - 가장 큰 연속된 공간 사용 -Description-ku.UTF-8: Bi alîkarî - cihê vala yê hevgirtî yê herî mezin bi kar bîne -Description-lt.UTF-8: Auto - naudoti didžiausią ištisinę laisvą vietą -Description-lv.UTF-8: Vadītā - izmantot lielāko secīgo brīvo diska vietu -Description-mk.UTF-8: Со помош - најголемиот континуиран празен простор -Description-ml.UTF-8: ഗൈഡഡ് - ഏറ്റവും വലിയ തുടര്ചയായ ഫ്രീ സ്പേയ്സ് ഉപയോഗിക്കൂ -Description-nb.UTF-8: Veiledet - bruk største sammenhengende frie plass -Description-ne.UTF-8: मार्गदर्शक गरिएको: ठूलो निरन्तर खाली स्पेसको प्रयोग गर्नुहोस् -Description-nl.UTF-8: Begeleid - grootste aangesloten vrije ruimte gebruiken -Description-nn.UTF-8: Vegleiing - Bruk området som har mest samanhengande ledig plass -Description-no.UTF-8: Veiledet - bruk største sammenhengende frie plass -Description-pa.UTF-8: ਸਹਾਇਤਾ ਨਾਲ - ਵੱਡੀ ਲਗਾਤਾਰ ਖਾਲੀ ਥਾਂ ਵਰਤੋਂ -Description-pl.UTF-8: Przewodnik - największa, ciągła, wolna przestrzeń -Description-pt.UTF-8: Guiado - usar o maior espaço livre contínuo -Description-pt_BR.UTF-8: Assistido - usar maior espaço livre contínuo -Description-ro.UTF-8: Ghidată - pe cel mai mare spaţiu liber continuu -Description-ru.UTF-8: Авто - использовать наибольшее свободное место -Description-sk.UTF-8: Sprievodca - použiť najväčšie súvislé voľné miesto -Description-sl.UTF-8: Uporabi največji neprekinjen nezaseden prostor -Description-sq.UTF-8: E drejtuar - përdor hapësirën e lirë më të madhe -Description-sv.UTF-8: Guidad - använd största oavbrutna lediga utrymmet -Description-ta.UTF-8: வழிநடத்தி - மிகப் பெரிய தொடர்ச்சியான வெற்றிடத்தை உபயோகி -Description-th.UTF-8: แนะแนว - ใช้พื้นที่ว่างต่อเนื่องที่ใหญ่ที่สุด -Description-tl.UTF-8: May gabay - gamitin ang pinakamalaking malayang puwang na magkarugtong -Description-tr.UTF-8: Kılavuzla - en büyük kesintisiz boş alanı kullan -Description-uk.UTF-8: З допомогою - використати найбільший шматок вільного простору -Description-vi.UTF-8: Hướng dẫn — dùng chỗ rỗng liên tục lớn nhất -Description-wo.UTF-8: Gindee - jëfandikool espaas bu féex bi taqaloo bi ëpp -Description-zh_CN.UTF-8: 向导 - 使用最大的连续空闲空间 -Description-zh_TW.UTF-8: 導引 - 使用最大的連續未使用空間 diff --git a/xorg.conf b/xorg.conf index 25d3d2c..d7bb2f1 100644 --- a/xorg.conf +++ b/xorg.conf @@ -1,4 +1,4 @@ -# xorg.conf (Xorg X Window System server configuration file) +# xorg.conf (X.Org X Window System server configuration file) # # This file was generated by dexconf, the Debian X Configuration tool, using # values from the debconf database. @@ -11,44 +11,12 @@ # package. # # If you have edited this file but would like it to be automatically updated -# again, run the following commands as root: -# -# cp /etc/X11/xorg.conf /etc/X11/xorg.conf.custom -# md5sum /etc/X11/xorg.conf >/var/lib/xfree86/xorg.conf.md5sum -# dpkg-reconfigure xserver-xorg - -Section "Files" - FontPath "unix/:7100" # local font server - # if the local font server has problems, we can fall back on these - FontPath "/usr/lib/X11/fonts/misc" - FontPath "/usr/lib/X11/fonts/cyrillic" - FontPath "/usr/lib/X11/fonts/100dpi/:unscaled" - FontPath "/usr/lib/X11/fonts/75dpi/:unscaled" - FontPath "/usr/lib/X11/fonts/Type1" - FontPath "/usr/lib/X11/fonts/CID" - FontPath "/usr/lib/X11/fonts/100dpi" - FontPath "/usr/lib/X11/fonts/75dpi" -EndSection - -Section "Module" - Load "bitmap" - Load "dbe" - Load "ddc" - Load "dri" - Load "evdev" - Load "extmod" - Load "freetype" - Load "glx" - Load "int10" - Load "record" - Load "type1" - Load "vbe" -EndSection +# again, run the following command: +# sudo dpkg-reconfigure -phigh xserver-xorg Section "InputDevice" Identifier "Generic Keyboard" - Driver "keyboard" - Option "CoreKeyboard" + Driver "kbd" Option "XkbRules" "xorg" Option "XkbModel" "pc104" Option "XkbLayout" "us" @@ -57,64 +25,17 @@ EndSection Section "InputDevice" Identifier "Configured Mouse" Driver "mouse" - Option "CorePointer" - Option "Device" "/dev/input/mice" - Option "Protocol" "ImPS/2" - Option "Emulate3Buttons" "true" - Option "ZAxisMapping" "4 5" EndSection Section "Device" - Identifier "ATI Technologies, Inc. Rage 128 RF/SG AGP" - Driver "ati" - BusID "PCI:1:0:0" + Identifier "Configured Video Device" EndSection Section "Monitor" - Identifier "Generic Monitor" - Option "DPMS" - HorizSync 30-95 - VertRefresh 50-150 + Identifier "Configured Monitor" EndSection Section "Screen" Identifier "Default Screen" - Device "ATI Technologies, Inc. Rage 128 RF/SG AGP" - Monitor "Generic Monitor" - DefaultDepth 24 - SubSection "Display" - Depth 1 - Modes "1024x768" "800x600" "720x400" "640x480" - EndSubSection - SubSection "Display" - Depth 4 - Modes "1024x768" "800x600" "720x400" "640x480" - EndSubSection - SubSection "Display" - Depth 8 - Modes "1024x768" "800x600" "720x400" "640x480" - EndSubSection - SubSection "Display" - Depth 15 - Modes "1024x768" "800x600" "720x400" "640x480" - EndSubSection - SubSection "Display" - Depth 16 - Modes "1024x768" "800x600" "720x400" "640x480" - EndSubSection - SubSection "Display" - Depth 24 - Modes "1024x768" "800x600" "720x400" "640x480" - EndSubSection -EndSection - -Section "ServerLayout" - Identifier "Default Layout" - Screen "Default Screen" - InputDevice "Generic Keyboard" - InputDevice "Configured Mouse" -EndSection - -Section "DRI" - Mode 0666 + Monitor "Configured Monitor" EndSection