diff --git a/Makefile.defs b/Makefile.defs index 9fb18b1..b0fc9c1 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -156,6 +156,9 @@ libpostproc.so.52[][64bit] = libpostproc-ffmpeg libpostproc.so.52[LIBPOSTPROC_52][64bit] = libpostproc-ffmpeg libswresample.so.0[][64bit] = libswresample-ffmpeg libswresample.so.0[LIBSWRESAMPLE_0][64bit] = libswresample-ffmpeg +libpoppler-qt4.so.4[][64bit] = libpoppler-qt4 +libpoppler-cpp.so.0[][64bit] = libpoppler +libpoppler-glib.so.8[][64bit] = libpoppler-glib else libGL.so.1 = libGL-Mesa-dri libGLU.so.1 = libGL-Mesa-dri @@ -193,6 +196,9 @@ libpostproc.so.52 = libpostproc-ffmpeg libpostproc.so.52[LIBPOSTPROC_52] = libpostproc-ffmpeg libswresample.so.0 = libswresample-ffmpeg libswresample.so.0[LIBSWRESAMPLE_0] = libswresample-ffmpeg +libpoppler-qt4.so.4 = libpoppler-qt4 +libpoppler-cpp.so.0 = libpoppler +libpoppler-glib.so.8 = libpoppler-glib endif /usr/bin/python = python python[abi] = python diff --git a/makedist.inc.sh b/makedist.inc.sh index 0d244c8..aeed5c1 100644 --- a/makedist.inc.sh +++ b/makedist.inc.sh @@ -85,10 +85,7 @@ fi [[ "$TARGET_HOSTNAME" ]] || TARGET_HOSTNAME="$MAKEDIST_TARGET" [[ "$TARGET_DOMAIN" ]] || TARGET_DOMAIN="localdomain" -echo "$TARGET_HOSTNAME" > $MOUNTDIR/etc/hostname -sed -i "s|HOSTNAME=.*|HOSTNAME=$TARGET_HOSTNAME|" $MOUNTDIR/etc/sysconfig/network -sed -i "s|\(127\.0\.0\.1\W*\)\(.*\)|\1 $TARGET_HOSTNAME.$TARGET_DOMAIN $TARGET_HOSTNAME \2|" \ - $MOUNTDIR/etc/hosts +echo "$TARGET_HOSTNAME.$TARGET_DOMAIN" > $MOUNTDIR/etc/hostname #install_rpms_by_target "Installing tools packages for ${MAKEDIST_TARGET} target" ${MAKEDIST_TARGET}-tools "" install_rpms_by_target "Installing ${PLATFORM} platform packages" ${MAKEDIST_TARGET}-${PLATFORM} "${RPMEXTRAARGS}" diff --git a/platforms/livecd-gnome-root/Makefile b/platforms/livecd-gnome-root/Makefile index cff2b87..ffcf327 100644 --- a/platforms/livecd-gnome-root/Makefile +++ b/platforms/livecd-gnome-root/Makefile @@ -1,17 +1,17 @@ $(MAKEDIST_TARGET)-livecd-gnome: \ openssh-server usbutils wireless_tools parted iputils file rootfiles \ - ppp minicom chrony locales mc alsa-utils \ - man-db curl zip unzip iptables iproute wpa_supplicant mtd-utils nfs-utils \ + ppp minicom locales mc alsa-utils \ + man-db curl zip unzip iptables iproute mtd-utils nfs-utils \ openssh-clients binutils telnet ftp debianutils diffutils bluez traceroute \ timezone sudo openobex liblame expect prelink NetworkManager \ ModemManager network-manager-applet Mesa-tools \ x11vnc xorg-server xorg-drv-video-fbdev xorg-drv-input-evdev xorg-drv-input-keyboard \ xorg-drv-input-mouse xorg-drv-input-void \ xorg-drv-input-tslib xcursor-transparent-theme rpm smart desktop-base-openmamba \ - gdm gnome-session gnome-common gnome-control-center gnome-desktop gnome-desktop-sharp \ + gdm gnome-session gnome-common gnome-control-center gnome-desktop \ gnome-keyring gnome-menus gnome-mime-data gnome-packagekit gnome-settings-daemon \ - gnome-sharp gnome-terminal nautilus gnome-themes evolution gnome-utils gnome-system-log \ - desktop-base-gnome gimp vlc gconf-editor rhythmbox + gnome-terminal nautilus gnome-themes evolution gnome-utils gnome-system-log \ + desktop-base-gnome gimp vlc gconf-editor rhythmbox brasero #kitchensync4 kontact4 kmail4 akregator4 kdeplasma-addons amarok $(MAKEDIST_TARGET)-livecd-libreoffice: libreoffice-calc libreoffice-writer libreoffice-impress diff --git a/platforms/livecd-gnome-root/post.inc.sh b/platforms/livecd-gnome-root/post.inc.sh index efab007..bb8edc3 100644 --- a/platforms/livecd-gnome-root/post.inc.sh +++ b/platforms/livecd-gnome-root/post.inc.sh @@ -1,18 +1,3 @@ -## don't activate some services -#rm -f $MOUNTDIR/etc/rcsysinit.d/{S35hdparm,S30loadmodules,S40swap} -#rm -f $MOUNTDIR/etc/rc*.d/{S12random,S13sysinit,S20network,S44acpid,S55sshd} -#rm -f $MOUNTDIR/etc/rc*.d/{K00splash,K01acpid,K90random,K96swap,K97network,K97udev,K98localnet} - -# change inittab so it opens tty root shells instead of asking for login -# -echo "Forcing \`inittab' to open tty root shells with no login..." -sed -i 's,^1:.*,1:234:respawn:/sbin/mingetty --autologin root --loginpause --noclear tty1,' $MOUNTDIR/etc/inittab -sed -i 's,^\([2-3]\):.*,\1:2345:respawn:/sbin/mingetty --autologin root --loginpause --noclear tty\1,' $MOUNTDIR/etc/inittab -sed -i '/^[4-6]:.*/d' $MOUNTDIR/etc/inittab - -# configure for runlevel 5 boot -sed -i "s|id:3\(:initdefault.*\)|id:5\1|" $MOUNTDIR/etc/inittab - # configure GDM for autologin # cat > $MOUNTDIR/etc/gdm/custom.conf << _EOF @@ -38,8 +23,7 @@ case $LANGUAGE in es) timezone=Europe/Madrid ;; *) timezone=UTC ;; esac -echo $timezone > $MOUNTDIR/etc/timezone -cp $MOUNTDIR/usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime +ln -s ../usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime # clean rpm database before doing other operations with internal rpm # to fix cross x86/x86_64 installation error: diff --git a/platforms/livecd-gnome-root/settings.inc b/platforms/livecd-gnome-root/settings.inc index 470534e..3a5e97f 100644 --- a/platforms/livecd-gnome-root/settings.inc +++ b/platforms/livecd-gnome-root/settings.inc @@ -2,9 +2,16 @@ PRODUCT_NAME=livecd-gnome MEDIA=squash_xz MULTITHREAD=1 -KERNEL_EXTRAVER=mamba -KERNEL_PLATFORM="" -#KERNEL_ADDITIONAL="extramodules" +if [ "$ARCH" = "i586" ]; then + KERNEL_EXTRAVER=mamba + KERNEL_PLATFORM="" + #KERNEL_ADDITIONAL="extramodules" + KERNEL_MORE_EXTRAVER=mamba-64GB +elif [ "$ARCH" = "x86_64" ]; then + KERNEL_EXTRAVER=mamba-x86_64 + KERNEL_PLATFORM="" + #KERNEL_ADDITIONAL="extramodules" +fi TARGET_HOSTNAME=openmamba-gnome ROOTDEV= diff --git a/platforms/livecd-light-root/Makefile b/platforms/livecd-light-root/Makefile index 6fc5466..d2b9448 100644 --- a/platforms/livecd-light-root/Makefile +++ b/platforms/livecd-light-root/Makefile @@ -1,5 +1,5 @@ $(MAKEDIST_TARGET)-livecd-light: openssh-server usbutils wireless_tools parted iputils file rootfiles \ - ppp minicom chrony locales mc alsa-utils \ + ppp minicom locales mc alsa-utils \ man-db curl zip unzip iptables iproute wpa_supplicant mtd-utils nfs-utils \ openssh-clients binutils telnet ftp debianutils diffutils bluez traceroute \ lxde timezone sudo \ @@ -19,7 +19,7 @@ $(MAKEDIST_TARGET)-livecd-light-root: \ ttf-freefont liberation-fonts-ttf \ gparted ntfs-3g libdvdcss \ chromium totem-mozilla-plugin \ - macbook-tools livecd-tools \ + livecd-tools \ Mesa-tools driconf parted testdisk \ samba-server \ smart-gui cpufreqd mambatray \ diff --git a/platforms/livecd-light-root/post.inc.sh b/platforms/livecd-light-root/post.inc.sh index 2fc0500..0ddddca 100644 --- a/platforms/livecd-light-root/post.inc.sh +++ b/platforms/livecd-light-root/post.inc.sh @@ -1,18 +1,3 @@ -## don't activate some services -#rm -f $MOUNTDIR/etc/rcsysinit.d/{S35hdparm,S30loadmodules,S40swap} -#rm -f $MOUNTDIR/etc/rc*.d/{S12random,S13sysinit,S20network,S44acpid,S55sshd} -#rm -f $MOUNTDIR/etc/rc*.d/{K00splash,K01acpid,K90random,K96swap,K97network,K97udev,K98localnet} - -# change inittab so it opens tty root shells instead of asking for login -# -echo "Forcing \`inittab' to open tty root shells with no login..." -sed -i 's,^1:.*,1:234:respawn:/sbin/mingetty --autologin root --loginpause --noclear tty1,' $MOUNTDIR/etc/inittab -sed -i 's,^\([2-3]\):.*,\1:2345:respawn:/sbin/mingetty --autologin root --loginpause --noclear tty\1,' $MOUNTDIR/etc/inittab -sed -i '/^[4-6]:.*/d' $MOUNTDIR/etc/inittab - -# configure for runlevel 5 boot -sed -i "s|id:3\(:initdefault.*\)|id:5\1|" $MOUNTDIR/etc/inittab - # configure LXDM for autologin # sed -i "s|# autologin.*|autologin=liveuser|" $MOUNTDIR/etc/lxdm/lxdm.conf @@ -27,8 +12,7 @@ case $LANGUAGE in es) timezone=Europe/Madrid ;; *) timezone=UTC ;; esac -echo $timezone > $MOUNTDIR/etc/timezone -cp $MOUNTDIR/usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime +ln -s ../usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime # clean rpm database before doing other operations with internal rpm # to fix cross x86/x86_64 installation error: diff --git a/platforms/livecd-root/post.inc.sh b/platforms/livecd-root/post.inc.sh index 4e10e8b..906d95a 100644 --- a/platforms/livecd-root/post.inc.sh +++ b/platforms/livecd-root/post.inc.sh @@ -1,18 +1,3 @@ -## don't activate some services -#rm -f $MOUNTDIR/etc/rcsysinit.d/{S35hdparm,S30loadmodules,S40swap} -#rm -f $MOUNTDIR/etc/rc*.d/{S12random,S13sysinit,S20network,S44acpid,S55sshd} -#rm -f $MOUNTDIR/etc/rc*.d/{K00splash,K01acpid,K90random,K96swap,K97network,K97udev,K98localnet} - -# change inittab so it opens tty root shells instead of asking for login -# -echo "Forcing \`inittab' to open tty root shells with no login..." -sed -i 's,^1:.*,1:234:respawn:/sbin/mingetty --autologin root --loginpause --noclear tty1,' $MOUNTDIR/etc/inittab -sed -i 's,^\([2-3]\):.*,\1:2345:respawn:/sbin/mingetty --autologin root --loginpause --noclear tty\1,' $MOUNTDIR/etc/inittab -sed -i '/^[4-6]:.*/d' $MOUNTDIR/etc/inittab - -# configure for runlevel 5 boot -sed -i "s|id:3\(:initdefault.*\)|id:5\1|" $MOUNTDIR/etc/inittab - # configure KDM for autologin # if [ -e $MOUNTDIR/opt/kde/share/config/kdm/kdmrc ]; then @@ -34,8 +19,7 @@ case $LANGUAGE in es) timezone=Europe/Madrid ;; *) timezone=UTC ;; esac -echo $timezone > $MOUNTDIR/etc/timezone -cp $MOUNTDIR/usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime +ln -s ../usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime # configure favorites in kde menu for f in /usr/share/applications/chromium-devel.desktop; do diff --git a/platforms/livedvd-root/post.inc.sh b/platforms/livedvd-root/post.inc.sh index cc48ddb..db8e55a 100644 --- a/platforms/livedvd-root/post.inc.sh +++ b/platforms/livedvd-root/post.inc.sh @@ -1,18 +1,3 @@ -## don't activate some services -#rm -f $MOUNTDIR/etc/rcsysinit.d/{S35hdparm,S30loadmodules,S40swap} -#rm -f $MOUNTDIR/etc/rc*.d/{S12random,S13sysinit,S20network,S44acpid,S55sshd} -#rm -f $MOUNTDIR/etc/rc*.d/{K00splash,K01acpid,K90random,K96swap,K97network,K97udev,K98localnet} - -# change inittab so it opens tty root shells instead of asking for login -# -echo "Forcing \`inittab' to open tty root shells with no login..." -sed -i 's,^1:.*,1:234:respawn:/sbin/mingetty --autologin root --loginpause --noclear tty1,' $MOUNTDIR/etc/inittab -sed -i 's,^\([2-3]\):.*,\1:2345:respawn:/sbin/mingetty --autologin root --loginpause --noclear tty\1,' $MOUNTDIR/etc/inittab -sed -i '/^[4-6]:.*/d' $MOUNTDIR/etc/inittab - -# configure for runlevel 5 boot -sed -i "s|id:3\(:initdefault.*\)|id:5\1|" $MOUNTDIR/etc/inittab - # configure KDM for autologin # if [ -e $MOUNTDIR/opt/kde/share/config/kdm/kdmrc ]; then @@ -29,16 +14,17 @@ chroot $MOUNTDIR update-alternatives-set-dri # set timezone according to LANGUAGE (default is UTC) # -case $LANGUAGE in - it) timezone=Europe/Rome ;; - es) timezone=Europe/Madrid ;; - fr) timezone=Europe/Paris ;; - de) timezone=Europe/Berlin ;; - en) timezone=Europe/London ;; - *) timezone=UTC ;; -esac -echo $timezone > $MOUNTDIR/etc/timezone -cp $MOUNTDIR/usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime +if [ ! "$MULTILANGUAGE" ]; then + case $LANGUAGE in + it) timezone=Europe/Rome ;; + es) timezone=Europe/Madrid ;; + fr) timezone=Europe/Paris ;; + de) timezone=Europe/Berlin ;; + en) timezone=Europe/London ;; + *) timezone=UTC ;; + esac + ln -s ../usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime +fi # configure favorites in kde menu for f in /usr/share/applications/chromium-devel.desktop /opt/kde/share/applications/amarok.desktop; do diff --git a/platforms/livegames-root/post.inc.sh b/platforms/livegames-root/post.inc.sh index ed23951..922a047 100644 --- a/platforms/livegames-root/post.inc.sh +++ b/platforms/livegames-root/post.inc.sh @@ -1,18 +1,3 @@ -## don't activate some services -#rm -f $MOUNTDIR/etc/rcsysinit.d/{S35hdparm,S30loadmodules,S40swap} -#rm -f $MOUNTDIR/etc/rc*.d/{S12random,S13sysinit,S20network,S44acpid,S55sshd} -#rm -f $MOUNTDIR/etc/rc*.d/{K00splash,K01acpid,K90random,K96swap,K97network,K97udev,K98localnet} - -# change inittab so it opens tty root shells instead of asking for login -# -echo "Forcing \`inittab' to open tty root shells with no login..." -sed -i 's,^1:.*,1:234:respawn:/sbin/mingetty --autologin root --loginpause --noclear tty1,' $MOUNTDIR/etc/inittab -sed -i 's,^\([2-3]\):.*,\1:2345:respawn:/sbin/mingetty --autologin root --loginpause --noclear tty\1,' $MOUNTDIR/etc/inittab -sed -i '/^[4-6]:.*/d' $MOUNTDIR/etc/inittab - -# configure for runlevel 5 boot -sed -i "s|id:3\(:initdefault.*\)|id:5\1|" $MOUNTDIR/etc/inittab - # configure KDM for autologin # if [ -e $MOUNTDIR/opt/kde/share/config/kdm/kdmrc ]; then @@ -34,8 +19,7 @@ case $LANGUAGE in es) timezone=Europe/Madrid ;; *) timezone=UTC ;; esac -echo $timezone > $MOUNTDIR/etc/timezone -cp $MOUNTDIR/usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime +ln -s ../usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime # configure favorites in kde menu for f in /usr/share/applications/chromium-devel.desktop; do diff --git a/platforms/rootfs-light/Makefile b/platforms/rootfs-light/Makefile index 784186d..a2c398a 100644 --- a/platforms/rootfs-light/Makefile +++ b/platforms/rootfs-light/Makefile @@ -4,15 +4,20 @@ $(MAKEDIST_TARGET)-$(PLATFORM)-arm: \ kernel-rpi kernel-rpi-modules \ kernel-cubox kernel-cubox-modules \ kernel-mamba-arm kernel-mamba-arm-sound kernel-mamba-arm-wireless \ + kernel-mamba-arm-dove kernel-mamba-arm-dove-sound kernel-mamba-arm-dove-wireless \ + kernel-sunxi kernel-sunxi-modules u-boot-sunxi-Bananapi \ brcm_patchram midori u-boot-tools $(MAKEDIST_TARGET)-$(PLATFORM)-i586: \ kernel-mamba kernel-mamba-sound kernel-mamba-wireless chromium \ kernel-mamba-64GB kernel-mamba-64GB-sound kernel-mamba-64GB-wireless +$(MAKEDIST_TARGET)-$(PLATFORM)-x86_64: \ + kernel-mamba-x86_64 kernel-mamba-x86_64-sound kernel-mamba-x86_64-wireless chromium + $(MAKEDIST_TARGET)-$(PLATFORM): $(MAKEDIST_TARGET)-devel \ lxde openssh-server usbutils wireless_tools screen i2c-tools \ - parted iputils file rootfiles ppp minicom chrony locales mc \ + parted iputils file rootfiles ppp minicom locales mc \ man-db curl zip unzip iptables iproute wpa_supplicant mtd-utils nfs-utils \ openssh-clients binutils telnet ftp debianutils diffutils bluez traceroute \ timezone sudo kmod \ diff --git a/platforms/rootfs-light/post.inc.sh b/platforms/rootfs-light/post.inc.sh index 8770fdb..5e62e81 100644 --- a/platforms/rootfs-light/post.inc.sh +++ b/platforms/rootfs-light/post.inc.sh @@ -34,24 +34,6 @@ #chkconfig --del portmap #" -## use system default language -#> $MOUNTDIR/etc/sysconfig/i18n - -# set localtime (default to Europe/Berlin) -case $LANGUAGE in - it) timezone=Europe/Rome ;; - es) timezone=Europe/Madrid ;; - *) timezone=Europe/Berlin ;; -esac -echo $timezone > $MOUNTDIR/etc/timezone -cp /usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime - -# disable automatic depmod and ldconfig execution on boot (also due to clock error) -cat >> $MOUNTDIR/etc/sysconfig/rc << _EOF -no_auto_depmod=1 -no_auto_ldconfig=1 -_EOF - # configure touchscreen cat > $MOUNTDIR/etc/ts-calibrate.conf << _EOF TSLIB_CONFFILE=/etc/ts.conf @@ -62,22 +44,6 @@ TSLIB_CALIBFILE=/etc/pointercal HOME=/root _EOF - -# change inittab so it opens tty root shells instead of asking for login -# -echo "Forcing \`inittab' to open tty root shells with no login..." -# configure for serial console login -#echo "s0:2345:respawn:/sbin/agetty -L -f /etc/issue 115200 tcc-uart0 vt100" >> $MOUNTDIR/etc/inittab -sed -i 's,^1:.*,1:234:respawn:/sbin/mingetty --autologin root --loginpause --noclear tty1,' $MOUNTDIR/etc/inittab -sed -i 's,^\([2-3]\):.*,\1:2345:respawn:/sbin/mingetty --autologin root --loginpause --noclear tty\1,' $MOUNTDIR/etc/inittab -sed -i 's,^4:.*,4:2345:respawn:/sbin/agetty ttyS0 115200,' $MOUNTDIR/etc/inittab -sed -i 's,^5:.*,5:2345:respawn:/sbin/agetty ttyGS0 115200,' $MOUNTDIR/etc/inittab -sed -i 's,^6:.*,6:2345:respawn:/sbin/agetty ttyAMA0 115200,' $MOUNTDIR/etc/inittab -#sed -i '/^[5-6]:.*/d' $MOUNTDIR/etc/inittab - -# configure for runlevel 5 boot -sed -i "s|id:3\(:initdefault.*\)|id:5\1|" $MOUNTDIR/etc/inittab - # configure LXDM for autologin # sed -i "s|# autologin.*|autologin=liveuser|" $MOUNTDIR/etc/lxdm/lxdm.conf @@ -89,8 +55,7 @@ case $LANGUAGE in es) timezone=Europe/Madrid ;; *) timezone=UTC ;; esac -echo $timezone > $MOUNTDIR/etc/timezone -cp $MOUNTDIR/usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime +ln -s ../usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime # remove some documentation to save space for f in ChangeLog Changelog CHANGES TODO NEWS README README.txt; do diff --git a/platforms/rootfs/Makefile b/platforms/rootfs/Makefile index f46b301..491be34 100644 --- a/platforms/rootfs/Makefile +++ b/platforms/rootfs/Makefile @@ -6,6 +6,7 @@ $(MAKEDIST_TARGET)-$(PLATFORM)-kde4: \ $(MAKEDIST_TARGET)-$(PLATFORM)-arm: \ kernel-iconia kernel-iconia-modules kernel-hannspad kernel-hannspad-modules \ + kernel-sgn kernel-sgn-modules \ kernel-mamba-arm kernel-mamba-arm-sound kernel-mamba-arm-wireless \ kernel-mamba-arm-firmware brcm_patchram u-boot-tools @@ -16,7 +17,7 @@ $(MAKEDIST_TARGET)-$(PLATFORM)-i586: \ $(MAKEDIST_TARGET)-$(PLATFORM): $(MAKEDIST_TARGET)-devel \ $(MAKEDIST_TARGET)-$(PLATFORM)-kde4 openssh-server usbutils wireless_tools i2c-tools \ - parted iputils file rootfiles ppp minicom chrony locales mc \ + parted iputils file rootfiles ppp minicom locales mc \ man-db curl zip unzip iptables iproute wpa_supplicant mtd-utils nfs-utils \ openssh-clients binutils telnet ftp debianutils diffutils bluez traceroute \ timezone sudo kmod \ @@ -24,7 +25,7 @@ $(MAKEDIST_TARGET)-$(PLATFORM): $(MAKEDIST_TARGET)-devel \ xorg-server x11vnc xkeyboard-config screen \ xorg-drv-input-tslib xcursor-transparent-theme rpm smart xdg-utils \ 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 mambatray kvkbd # startactive # tightvnc-server lxde network-manager-applet matchbox-keyboard midori Mesa-tools alsa-utils diff --git a/platforms/rootfs/post.inc.sh b/platforms/rootfs/post.inc.sh index fb9c4b2..d42c20b 100644 --- a/platforms/rootfs/post.inc.sh +++ b/platforms/rootfs/post.inc.sh @@ -34,24 +34,6 @@ #chkconfig --del portmap #" -## use system default language -#> $MOUNTDIR/etc/sysconfig/i18n - -# set localtime (default to Europe/Berlin) -case $LANGUAGE in - it) timezone=Europe/Rome ;; - es) timezone=Europe/Madrid ;; - *) timezone=Europe/Berlin ;; -esac -echo $timezone > $MOUNTDIR/etc/timezone -cp /usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime - -# disable automatic depmod and ldconfig execution on boot (also due to clock error) -cat >> $MOUNTDIR/etc/sysconfig/rc << _EOF -no_auto_depmod=1 -no_auto_ldconfig=1 -_EOF - # configure touchscreen cat > $MOUNTDIR/etc/ts-calibrate.conf << _EOF TSLIB_CONFFILE=/etc/ts.conf @@ -62,19 +44,6 @@ TSLIB_CALIBFILE=/etc/pointercal HOME=/root _EOF -# change inittab so it opens tty root shells instead of asking for login -# -echo "Forcing \`inittab' to open tty root shells with no login..." -sed -i 's,^1:.*,1:234:respawn:/sbin/mingetty --autologin root --loginpause --noclear tty1,' $MOUNTDIR/etc/inittab -sed -i 's,^\([2-3]\):.*,\1:2345:respawn:/sbin/mingetty --autologin root --loginpause --noclear tty\1,' $MOUNTDIR/etc/inittab -sed -i 's,^4:.*,4:2345:respawn:/sbin/agetty ttyS0 115200,' $MOUNTDIR/etc/inittab -sed -i 's,^5:.*,5:2345:respawn:/sbin/agetty ttyGS0 115200,' $MOUNTDIR/etc/inittab -sed -i 's,^6:.*,6:2345:respawn:/sbin/agetty ttyAMA0 115200,' $MOUNTDIR/etc/inittab -#sed -i '/^[5-6]:.*/d' $MOUNTDIR/etc/inittab - -# configure for runlevel 5 boot -sed -i "s|id:3\(:initdefault.*\)|id:5\1|" $MOUNTDIR/etc/inittab - # configure KDM for autologin # if [ -e $MOUNTDIR/opt/kde/share/config/kdm/kdmrc ]; then @@ -93,8 +62,7 @@ case $LANGUAGE in es) timezone=Europe/Madrid ;; *) timezone=UTC ;; esac -echo $timezone > $MOUNTDIR/etc/timezone -cp $MOUNTDIR/usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime +ln -s ../usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime # configure favorites in kde menu for f in /usr/share/applications/chromium-devel.desktop /opt/kde/share/applications/kaffeine.desktop; do diff --git a/platforms/testcd-root/post.inc.sh b/platforms/testcd-root/post.inc.sh index 98d9dfd..8fb459d 100644 --- a/platforms/testcd-root/post.inc.sh +++ b/platforms/testcd-root/post.inc.sh @@ -1,18 +1,3 @@ -## don't activate some services -#rm -f $MOUNTDIR/etc/rcsysinit.d/{S35hdparm,S30loadmodules,S40swap} -#rm -f $MOUNTDIR/etc/rc*.d/{S12random,S13sysinit,S20network,S44acpid,S55sshd} -#rm -f $MOUNTDIR/etc/rc*.d/{K00splash,K01acpid,K90random,K96swap,K97network,K97udev,K98localnet} - -# change inittab so it opens tty root shells instead of asking for login -# -echo "Forcing \`inittab' to open tty root shells with no login..." -sed -i 's,^1:.*,1:234:respawn:/sbin/mingetty --autologin root --loginpause --noclear tty1,' $MOUNTDIR/etc/inittab -sed -i 's,^\([2-3]\):.*,\1:2345:respawn:/sbin/mingetty --autologin root --loginpause --noclear tty\1,' $MOUNTDIR/etc/inittab -sed -i '/^[4-6]:.*/d' $MOUNTDIR/etc/inittab - -# configure for runlevel 5 boot -sed -i "s|id:3\(:initdefault.*\)|id:5\1|" $MOUNTDIR/etc/inittab - # configure KDM for autologin # if [ -e $MOUNTDIR/opt/kde/share/config/kdm/kdmrc ]; then @@ -34,8 +19,7 @@ case $LANGUAGE in es) timezone=Europe/Madrid ;; *) timezone=UTC ;; esac -echo $timezone > $MOUNTDIR/etc/timezone -cp $MOUNTDIR/usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime +ln -s ../usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime # configure favorites in kde menu for f in /usr/share/applications/chromium-devel.desktop; do diff --git a/platforms/virtualserver/post.inc.sh b/platforms/virtualserver/post.inc.sh index ab18cf6..6235b19 100644 --- a/platforms/virtualserver/post.inc.sh +++ b/platforms/virtualserver/post.inc.sh @@ -34,8 +34,7 @@ case $LANGUAGE in it) timezone=Europe/Rome ;; *) timezone=UTC ;; esac -echo $timezone > $MOUNTDIR/etc/timezone -cp $MOUNTDIR/usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime +ln -s ../usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime prelink