rootfs/rootfs-light: some fixes for arm target

This commit is contained in:
Silvan Calarco 2012-09-05 16:08:43 +02:00
parent 1afa4d43ca
commit ab8c4a5489
4 changed files with 23 additions and 34 deletions

View File

@ -16,7 +16,7 @@ $(MAKEDIST_TARGET)-$(PLATFORM): \
liblame expect prelink NetworkManager ModemManager procps \ liblame expect prelink NetworkManager ModemManager procps \
xorg-server x11vnc xkeyboard-config \ xorg-server x11vnc xkeyboard-config \
xorg-drv-input-tslib xcursor-transparent-theme rpm smart xdg-utils \ xorg-drv-input-tslib xcursor-transparent-theme rpm smart xdg-utils \
dhcp-server rfkill plymouth livecd-tools rdesktop \ dhcp-server rfkill plymouth livecd-tools rdesktop mingetty \
postplug-xorg postplug-sound gparted tar net-tools chrony mambatray kvkbd postplug-xorg postplug-sound gparted tar net-tools chrony mambatray kvkbd
# startactive # startactive

View File

@ -1,12 +1,3 @@
## disable tty virtual consoles
#sed -i "s|\(.:2345:respawn.*\)|#\1|" $MOUNTDIR/etc/inittab
# configure for serial console login
#echo "s0:2345:respawn:/sbin/agetty -L -f /etc/issue 115200 tcc-uart0 vt100" >> $MOUNTDIR/etc/inittab
# configure default root password
echo "openmamba" | chroot $MOUNTDIR passwd root --stdin
# add fstab entries # add fstab entries
#cat >> $MOUNTDIR/etc/fstab << _EOF #cat >> $MOUNTDIR/etc/fstab << _EOF
#/dev/mmcblk0p1 /mnt/sd0 auto defaults,noauto 0 0 #/dev/mmcblk0p1 /mnt/sd0 auto defaults,noauto 0 0
@ -76,16 +67,18 @@ TSLIB_CALIBFILE=/etc/pointercal
HOME=/root HOME=/root
_EOF _EOF
# change inittab so it opens tty root shells instead of asking for login # change inittab so it opens tty root shells instead of asking for login
# #
echo "Forcing \`inittab' to open tty root shells with no login..." echo "Forcing \`inittab' to open tty root shells with no login..."
#sed -i 's,^1:.*,1:2345:respawn:/sbin/mingetty --autologin root --noclear tty1,' $MOUNTDIR/etc/inittab # configure for serial console login
sed -i 's,^1:.*,1:234:respawn:/sbin/agetty tty1 9600,' $MOUNTDIR/etc/inittab #echo "s0:2345:respawn:/sbin/agetty -L -f /etc/issue 115200 tcc-uart0 vt100" >> $MOUNTDIR/etc/inittab
sed -i 's,^2:.*,2:2345:respawn:/sbin/agetty tty2 9600,' $MOUNTDIR/etc/inittab sed -i 's,^1:.*,1:234:respawn:/sbin/mingetty --autologin root --loginprog /sbin/login.live --noclear tty1,' $MOUNTDIR/etc/inittab
sed -i 's,^3:.*,3:2345:respawn:/sbin/agetty ttyS0 9600,' $MOUNTDIR/etc/inittab sed -i 's,^\([2-3]\):.*,\1:2345:respawn:/sbin/mingetty --autologin root --loginprog /sbin/login.live --noclear tty\1,' $MOUNTDIR/etc/inittab
sed -i 's,^4:.*,4:2345:respawn:/sbin/agetty ttyGS0 9600,' $MOUNTDIR/etc/inittab sed -i 's,^4:.*,4:2345:respawn:/sbin/agetty ttyS0 9600,' $MOUNTDIR/etc/inittab
sed -i 's,^5:.*,5:2345:respawn:/sbin/agetty ttyAMA0 9600,' $MOUNTDIR/etc/inittab sed -i 's,^5:.*,5:2345:respawn:/sbin/agetty ttyGS0 9600,' $MOUNTDIR/etc/inittab
sed -i '/^[5-6]:.*/d' $MOUNTDIR/etc/inittab sed -i 's,^6:.*,6:2345:respawn:/sbin/agetty ttyAMA0 9600,' $MOUNTDIR/etc/inittab
#sed -i '/^[5-6]:.*/d' $MOUNTDIR/etc/inittab
# configure for runlevel 5 boot # configure for runlevel 5 boot
sed -i "s|id:3\(:initdefault.*\)|id:5\1|" $MOUNTDIR/etc/inittab sed -i "s|id:3\(:initdefault.*\)|id:5\1|" $MOUNTDIR/etc/inittab
@ -122,4 +115,7 @@ cat > $MOUNTDIR/home/liveuser/.icons/default/index.theme << _EOF
Inherits=xcursor-transparent Inherits=xcursor-transparent
_EOF _EOF
# configure default liveuser password
echo "openmamba" | chroot $MOUNTDIR passwd liveuser --stdin
prelink prelink

View File

@ -23,7 +23,7 @@ $(MAKEDIST_TARGET)-$(PLATFORM): \
liblame expect prelink NetworkManager ModemManager procps \ liblame expect prelink NetworkManager ModemManager procps \
xorg-server x11vnc xkeyboard-config \ xorg-server x11vnc xkeyboard-config \
xorg-drv-input-tslib xcursor-transparent-theme rpm smart xdg-utils \ xorg-drv-input-tslib xcursor-transparent-theme rpm smart xdg-utils \
dhcp-server rfkill plymouth livecd-tools chromium \ dhcp-server rfkill plymouth livecd-tools chromium rdesktop mingetty \
postplug-xorg postplug-sound gparted tar net-tools chrony mambatray kvkbd postplug-xorg postplug-sound gparted tar net-tools chrony mambatray kvkbd
# startactive # startactive

View File

@ -1,12 +1,3 @@
## disable tty virtual consoles
#sed -i "s|\(.:2345:respawn.*\)|#\1|" $MOUNTDIR/etc/inittab
# configure for serial console login
#echo "s0:2345:respawn:/sbin/agetty -L -f /etc/issue 115200 tcc-uart0 vt100" >> $MOUNTDIR/etc/inittab
# configure default root password
echo "openmamba" | chroot $MOUNTDIR passwd root --stdin
# add fstab entries # add fstab entries
#cat >> $MOUNTDIR/etc/fstab << _EOF #cat >> $MOUNTDIR/etc/fstab << _EOF
#/dev/mmcblk0p1 /mnt/sd0 auto defaults,noauto 0 0 #/dev/mmcblk0p1 /mnt/sd0 auto defaults,noauto 0 0
@ -79,13 +70,12 @@ _EOF
# change inittab so it opens tty root shells instead of asking for login # change inittab so it opens tty root shells instead of asking for login
# #
echo "Forcing \`inittab' to open tty root shells with no login..." echo "Forcing \`inittab' to open tty root shells with no login..."
#sed -i 's,^1:.*,1:2345:respawn:/sbin/mingetty --autologin root --noclear tty1,' $MOUNTDIR/etc/inittab sed -i 's,^1:.*,1:234:respawn:/sbin/mingetty --autologin root --loginprog /sbin/login.live --noclear tty1,' $MOUNTDIR/etc/inittab
sed -i 's,^1:.*,1:234:respawn:/sbin/agetty tty1 9600,' $MOUNTDIR/etc/inittab sed -i 's,^\([2-3]\):.*,\1:2345:respawn:/sbin/mingetty --autologin root --loginprog /sbin/login.live --noclear tty\1,' $MOUNTDIR/etc/inittab
sed -i 's,^2:.*,2:2345:respawn:/sbin/agetty tty2 9600,' $MOUNTDIR/etc/inittab sed -i 's,^4:.*,4:2345:respawn:/sbin/agetty ttyS0 9600,' $MOUNTDIR/etc/inittab
sed -i 's,^3:.*,3:2345:respawn:/sbin/agetty ttyS0 9600,' $MOUNTDIR/etc/inittab sed -i 's,^5:.*,5:2345:respawn:/sbin/agetty ttyGS0 9600,' $MOUNTDIR/etc/inittab
sed -i 's,^4:.*,4:2345:respawn:/sbin/agetty ttyGS0 9600,' $MOUNTDIR/etc/inittab sed -i 's,^6:.*,6:2345:respawn:/sbin/agetty ttyAMA0 9600,' $MOUNTDIR/etc/inittab
sed -i 's,^5:.*,5:2345:respawn:/sbin/agetty ttyAMA0 9600,' $MOUNTDIR/etc/inittab #sed -i '/^[5-6]:.*/d' $MOUNTDIR/etc/inittab
sed -i '/^[5-6]:.*/d' $MOUNTDIR/etc/inittab
# configure for runlevel 5 boot # configure for runlevel 5 boot
sed -i "s|id:3\(:initdefault.*\)|id:5\1|" $MOUNTDIR/etc/inittab sed -i "s|id:3\(:initdefault.*\)|id:5\1|" $MOUNTDIR/etc/inittab
@ -134,4 +124,7 @@ cat > $MOUNTDIR/home/liveuser/.icons/default/index.theme << _EOF
Inherits=xcursor-transparent Inherits=xcursor-transparent
_EOF _EOF
# configure default liveuser password
echo "openmamba" | chroot $MOUNTDIR passwd liveuser --stdin
prelink prelink