[Debian-eeepc-commits] [SCM] A live-helper based Debian live & installer image for the Eee PC. branch, master, updated. 946b96aee843570ee712760a6fde8aee615fd9b1
Ben Armstrong
synrg at debian.org
Sat Apr 11 01:02:10 UTC 2009
The following commit has been merged in the master branch:
commit 946b96aee843570ee712760a6fde8aee615fd9b1
Author: Ben Armstrong <synrg at debian.org>
Date: Fri Apr 10 22:01:51 2009 -0300
Bump up to beta1, adjust package selection
diff --git a/Changelog b/Changelog
index 8dc2ffd..bbbf5af 100644
--- a/Changelog
+++ b/Changelog
@@ -1,8 +1,8 @@
-1.0~a10
+1.0~b1
-------
* Rebuild against panthera's 2.6.29 kernel backport.
* Change to wicd from backports.org instead of sid.
- * Use pre-release of eeepc-acpi-scripts 1.1.0.
+ * Use eeepc-acpi-scripts 1.1.0 from sid.
* Remove non-free madwifi, as the free ath5k in 2.6.29 replaces
it.
* Remove rt2860 and atl2 module packages as 2.6.29 now
@@ -14,9 +14,23 @@
* Remove /etc/modules, as appropriate modules are now probed
automatically (in particular, pciehp is replaced by
rfkill_input under 2.6.29).
+ * Remove gnome-power-manager and gdm as that saves us
+ dragging in a huge number of gnome dependencies, saving
+ us ~80M in installed packages size.
+ * Disable apt recommends, as otherwise gdm is installed
+ because lxde recommends it. Re-add in packages list
+ anything we really did need (iceweasel, hal, alsa-base,
+ alsa-utils).
+ * Add autologin via /etc/inittab to replace gdm autologin.
* Explicitly include dhcp3-client, as otherwise wicd
includes dhcpcd instead which does not auto-configure
/etc/resolv.conf.
+ * Turn on OSD.
+ * In lxpanel, drop cpu monitor and add caps-lock indicator,
+ battery indicator.
+ * Add some audio/video apps: tunapie, streamripper,
+ audacious, smplayer.
+ * Add some aministrative tools: gksu, synaptic.
1.0~a9
------
diff --git a/config/binary b/config/binary
index c193944..d3f692a 100644
--- a/config/binary
+++ b/config/binary
@@ -14,7 +14,7 @@ LH_BINARY_INDICES="enabled"
# $LH_BOOTAPPEND_LIVE: set boot parameters
# (Default: empty)
-LH_BOOTAPPEND_LIVE=""
+LH_BOOTAPPEND_LIVE="noautologin"
# $LH_BOOTAPPEND_INSTALL: set boot parameters
# (Default: empty)
diff --git a/config/chroot_local-hooks/eeepc.sh b/config/chroot_local-hooks/eeepc.sh
index c274848..9ec6346 100755
--- a/config/chroot_local-hooks/eeepc.sh
+++ b/config/chroot_local-hooks/eeepc.sh
@@ -3,3 +3,5 @@
echo "modprobe -r snd-hda-intel" >> /etc/default/halt
echo "HWCLOCKPARS=--directisa" >> /etc/default/rcS
+# Demo a few features that are not turned on by default
+sed -i "s/ENABLE_OSD='no'/ENABLE_OSD='yes'/" /etc/default/eeepc-acpi-scripts
diff --git a/config/chroot_local-includes/etc/inittab b/config/chroot_local-includes/etc/inittab
index 1583c23..e245b96 100644
--- a/config/chroot_local-includes/etc/inittab
+++ b/config/chroot_local-includes/etc/inittab
@@ -46,7 +46,7 @@ po::powerokwait:/etc/init.d/powerfail stop
# Format:
# <id>:<runlevels>:<action>:<process>
#1:2345:respawn:/sbin/getty 38400 tty1
-1:2345:respawn:/bin/login -f live tty1 </dev/tty1 >/dev/tty1 2>&1
+1:2345:respawn:/bin/login -f user tty1 </dev/tty1 >/dev/tty1 2>&1
2:23:respawn:/sbin/getty 38400 tty2
3:23:respawn:/sbin/getty 38400 tty3
4:23:respawn:/sbin/getty 38400 tty4
diff --git a/config/chroot_local-includes/etc/skel/.bash_profile b/config/chroot_local-includes/etc/skel/.bash_profile
index fc01c42..a225eea 100644
--- a/config/chroot_local-includes/etc/skel/.bash_profile
+++ b/config/chroot_local-includes/etc/skel/.bash_profile
@@ -15,10 +15,11 @@ if [ -d ~/bin ] ; then
PATH=~/bin:"${PATH}"
fi
+# autologin, looping with a small delay to allow user to bail
if [ -z "$DISPLAY" ] && [ $(tty) = /dev/tty1 ]; then
while true; do
startx --
- sleep 10
+ sleep 1
done
fi
diff --git a/config/chroot_local-includes/etc/xdg/autostart/gnome-power-manager.desktop b/config/chroot_local-includes/etc/xdg/autostart/gnome-power-manager.desktop
deleted file mode 100644
index bc5663e..0000000
--- a/config/chroot_local-includes/etc/xdg/autostart/gnome-power-manager.desktop
+++ /dev/null
@@ -1,138 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Power Manager
-Name[ar]=مدير الطاقة
-Name[as]=Power Manager
-Name[be at latin]=Kiraŭnik siłkavańnia
-Name[bg]=Управление на захранването
-Name[bn]=বিদ্যুৎ ম্যানেজার
-Name[bn_IN]=Power Manager
-Name[ca]=Gestor d'energia
-Name[cs]=Správce napájení
-Name[cy]=Rheolwr Pŵer
-Name[da]=Strømstyring
-Name[de]=Energieverwaltung
-Name[dz]=ནུས་ཤུགས་འཛིན་སྐྱོང་པ།
-Name[el]=Διαχείριση ενέργειας
-Name[en_CA]=Power Manager
-Name[en_GB]=Power Manager
-Name[es]=Gestión de energía
-Name[et]=Vooluhaldur
-Name[eu]=Energia kudeatzailea
-Name[fa]=مدیر برق
-Name[fi]=Virranhallinta
-Name[fr]=Gestionnaire d'énergie
-Name[ga]=Bainisteoir na Cumhachta
-Name[gl]=Xestor de enerxía
-Name[gu]=પાવર મેનેજર
-Name[he]=מנהל צריכת החשמל
-Name[hi]=शक्ति प्रबंधक
-Name[hu]=Energiakezelő
-Name[id]=Manajer Daya
-Name[it]=Gestore alimentazione
-Name[ja]=電源の管理
-Name[ka]=ენერგიის მმართველი
-Name[ko]=전원 관리자
-Name[ku]=Gerînendeyê Hêzê
-Name[lt]=Energijos valdymo programa
-Name[lv]=Barošanas pārvaldnieks
-Name[mg]=Mpitantana Angovo
-Name[mk]=Менаџер на енергија за GNOME
-Name[ml]=വൈദ്യുതി നടത്തിപ്പുകാരന്
-Name[mr]=पावर व्यवस्थापन
-Name[nb]=Strømstyring
-Name[nl]=Energiebeheer
-Name[nn]=Straumstyring
-Name[or]=ଶକ୍ତି ପରିଚାଳକ
-Name[pa]=ਪਾਵਰ ਮੈਨੇਜਰ
-Name[pl]=Menedżer zasilania
-Name[pt]=Gestor de Energia
-Name[pt_BR]=Gerenciador de Energia
-Name[ru]=Управление питанием
-Name[si]=ශක්ති කළමණාකරු
-Name[sk]=Správca napájania
-Name[sl]=Upravitelj porabe
-Name[sr]=Управник потрошњом електричне енергије
-Name[sr at Latn]=Upravnik potrošnjom električne energije
-Name[sv]=Strömhanterare
-Name[ta]=மின் மேலாளர்
-Name[th]=เครื่องมือจัดการการใช้พลังงาน
-Name[tr]=Güç Yöneticisi
-Name[uk]=Менеджер живлення
-Name[vi]=Bộ Quản Lý Điện Năng
-Name[zh_CN]=电源管理器
-Name[zh_HK]=電源管理程式
-Name[zh_TW]=電源管理程式
-Comment=Power management daemon
-Comment[ar]=رقيب إدارة الطاقة
-Comment[as]=বিদ্যুত্ পৰিচালনা সম্বন্ধীয় ডেমন
-Comment[be at latin]=Deman kiravańnia enerhijaj
-Comment[bg]=Демон за управление на захранването
-Comment[bn]=বিদ্যুৎ ব্যবস্থাপনা ড্যেমন
-Comment[bn_IN]=বিদ্যুত্ পরিচালনা সম্বন্ধীয় ডেমন
-Comment[ca]=Dimoni del gestor d'energia
-Comment[cs]=Démon správy napájení
-Comment[cy]=Ellyll rheoli pŵer
-Comment[da]=Strømstyringstjeneste
-Comment[de]=Hintergrundprozess der Energieverwaltung
-Comment[dz]=ནུས་ཤུགས་འཛིན་སྐྱོངས་པའི་ ཌེ་མཱོན།
-Comment[el]=Daemon διαχείρισης ενέργειας
-Comment[en_CA]=Power management daemon
-Comment[en_GB]=Power management daemon
-Comment[es]=Demonio de gestión de energía
-Comment[et]=Vooluhaldusdeemon
-Comment[eu]=Energia kudeatzeko daemon-a
-Comment[fa]=شبح مدیریت برق
-Comment[fi]=Virranhallintapalvelin
-Comment[fr]=Moniteur du gestionnaire d'énergie
-Comment[gl]=Servizo de xestión de enerxía
-Comment[gu]=પાવર મેનેજમેન્ટ ડિમન
-Comment[hi]=शक्ति प्रबंघक डेमॉन
-Comment[hu]=Energiakezelő démon
-Comment[id]=Daemon manajemen daya
-Comment[it]=Demone di gestione dell'alimentazione
-Comment[ja]=電源管理のデーモンを起動します
-Comment[ka]=ენერგიის მმართველის დემონი
-Comment[ko]=전원 관리 데몬
-Comment[ku]=Gerînendeyê hêzê yê veşartî
-Comment[lt]=Energijos valdymo tarnyba
-Comment[lv]=Barošanas pārvaldnieka demons
-Comment[mg]=Daemon'ny fitantanana angovo
-Comment[mk]=Демон за менаџмент на енергија
-Comment[ml]=വൈദ്യുതി നടത്തിപ്പിനുള്ള നിരന്തരപ്രക്രിയ
-Comment[mr]=पावर व्यवस्थापन डीमन
-Comment[nb]=Strømstyring
-Comment[nl]=Energiebeheer-daemon
-Comment[nn]=Straumstyring
-Comment[or]=ଶକ୍ତି ପରିଚାଳନା ଡେମନ
-Comment[pa]=ਪਾਵਰ ਮੈਨੇਜ਼ਮਿੰਟ ਡੈਮਨ
-Comment[pl]=Usługa menedżera zasilania
-Comment[pt]=Daemon de gestão energia
-Comment[pt_BR]=Monitor de gerenciamento de energia
-Comment[ro]=Demon de gestiune a alimentării
-Comment[ru]=Служба управления питанием
-Comment[si]=ශක්ති කළමණාකරු විබුද්ධකයා
-Comment[sk]=Daemon Správy napájania
-Comment[sl]=Demon upravitelja porabe
-Comment[sr]=Позадински процес за управљање потрошњом
-Comment[sr at Latn]=Pozadinski proces za upravljanje potrošnjom
-Comment[sv]=Strömhanteringsdemon
-Comment[ta]=மின் மேலாளர் டீமான்
-Comment[th]=ดีมอนจัดการการใช้พลังงาน
-Comment[tr]=Güç yönetimi servisi
-Comment[uk]=Служба керування живленням
-Comment[vi]=Trình nền quản lý điện năng
-Comment[zh_CN]=电源管理守护程序
-Comment[zh_HK]=電源管理服務程式
-Comment[zh_TW]=電源管理服務程式
-Icon=gnome-power-manager
-Exec=gnome-power-manager
-Terminal=false
-Type=Application
-Categories=
-OnlyShowIn=GNOME;XFCE;LXDE;
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=gnome-power-manager
-X-GNOME-Bugzilla-Component=gnome-power-manager
-X-GNOME-Bugzilla-Version=2.22.1
-X-GNOME-Bugzilla-ExtraInfoScript=gnome-power-bugreport.sh
diff --git a/config/chroot_local-packageslists/eeepc b/config/chroot_local-packageslists/eeepc
index 274d3a3..74b6b35 100644
--- a/config/chroot_local-packageslists/eeepc
+++ b/config/chroot_local-packageslists/eeepc
@@ -1,5 +1,7 @@
locales
eeepc-acpi-scripts
xserver-xorg-video-intel xserver-xorg-video-vesa xserver-xorg-input-synaptics xserver-xorg-input-kbd xserver-xorg-input-mouse xserver-xorg-input-evdev xorg xserver-xorg-input-all- xserver-xorg-video-all-
-gdm menu
-lxde dhcp3-client wicd gnome-power-manager aosd-cat
+menu
+lxde dhcp3-client wicd aosd-cat hal iceweasel alsa-base alsa-utils
+tunapie streamripper audacious smplayer
+gksu synaptic
diff --git a/config/common b/config/common
index be02551..578e983 100644
--- a/config/common
+++ b/config/common
@@ -22,7 +22,7 @@ LH_APT_PIPELINE=""
# $LH_APT_RECOMMENDS: set apt/aptitude recommends
# (Default: enabled)
-LH_APT_RECOMMENDS="enabled"
+LH_APT_RECOMMENDS="disabled"
# $LH_APT_SECURE: set apt/aptitude security
# (Default: enabled)
diff --git a/config/source b/config/source
index 1ac0ea6..6747186 100644
--- a/config/source
+++ b/config/source
@@ -1,8 +1,8 @@
# config/source - options for live-helper(7), source stage
# $LH_SOURCE: set source option
-# (Default: disabled)
-LH_SOURCE="disabled"
+# (Default: enabled)
+LH_SOURCE="enabled"
# $LH_SOURCE_IMAGES: set image type
# (Default: tar)
--
A live-helper based Debian live & installer image for the Eee PC.
More information about the Debian-eeepc-commits
mailing list