mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-29 13:46:49 +00:00
Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-next
Conflicts: packages/initramfs/sysutils/busybox-initramfs/scripts/init
This commit is contained in:
Stephan Raue
commit
6f92ac534d
@ -172,8 +172,15 @@ NFS_OVERLAY="192.168.1.1:/var/lib/overlay"
|
||||
|
||||
[ ! -e /sysroot/sbin/init ] && /bin/busybox usleep 1000000
|
||||
|
||||
<<<<<<< HEAD
|
||||
[ ${retry_nr} -gt 0 ]
|
||||
done
|
||||
=======
|
||||
if [ -n "$disk" ]; then
|
||||
mount_part "$disk" "/storage" "rw,noatime"
|
||||
update "Kernel" "$IMAGE_KERNEL" "/flash/$IMAGE_KERNEL"
|
||||
update "System" "$IMAGE_SYSTEM" "/flash/$IMAGE_SYSTEM"
|
||||
>>>>>>> 32562d4fa964979f0879f096451a8bbc20b9f7d9
|
||||
|
||||
if [ ! -e /sysroot/sbin/init ]; then
|
||||
error "INIT_2" "Could not mount NBD root from $NBD_ROOT_SERVER port $NBD_ROOT_PORT"
|
||||
@ -236,6 +243,16 @@ NFS_OVERLAY="192.168.1.1:/var/lib/overlay"
|
||||
mount_nbd
|
||||
fi
|
||||
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
# move /flash and /storage to /sysroot
|
||||
/bin/busybox mount --move /flash /sysroot/flash
|
||||
|
||||
if [ -n "$disk" ]; then
|
||||
/bin/busybox mount --move /storage /sysroot/storage
|
||||
fi
|
||||
|
||||
>>>>>>> 32562d4fa964979f0879f096451a8bbc20b9f7d9
|
||||
# unmount all other filesystems
|
||||
/bin/busybox umount /dev
|
||||
/bin/busybox umount /proc
|
||||
|
||||
@ -23,12 +23,6 @@
|
||||
#
|
||||
# runlevels: openelec, textmode
|
||||
|
||||
case $RUNLEVEL in
|
||||
boot)
|
||||
progress "set cpu's to full power"
|
||||
cpupower frequency-set -g performance > /dev/null 2>&1
|
||||
;;
|
||||
progress "set cpu's to full power"
|
||||
|
||||
poweroff|reboot)
|
||||
;;
|
||||
esac
|
||||
cpupower frequency-set -g performance > /dev/null 2>&1
|
||||
|
||||
@ -23,19 +23,13 @@
|
||||
#
|
||||
# runlevels: openelec, textmode
|
||||
|
||||
case $RUNLEVEL in
|
||||
boot)
|
||||
(
|
||||
progress "loading kernel modules"
|
||||
(
|
||||
progress "loading kernel modules"
|
||||
|
||||
IFS='
|
||||
'
|
||||
for module in `cat /etc/modules|grep "^[^#]"`; do
|
||||
eval "modprobe $module" >/dev/null 2>&1
|
||||
done
|
||||
)&
|
||||
;;
|
||||
IFS='
|
||||
'
|
||||
for module in `cat /etc/modules|grep "^[^#]"`; do
|
||||
eval "modprobe $module" >/dev/null 2>&1
|
||||
done
|
||||
|
||||
poweroff|reboot)
|
||||
;;
|
||||
esac
|
||||
)&
|
||||
|
||||
@ -22,23 +22,21 @@
|
||||
#
|
||||
# runlevels: openelec
|
||||
|
||||
case $RUNLEVEL in
|
||||
boot)
|
||||
progress "setup XBMC"
|
||||
progress "setup XBMC"
|
||||
|
||||
#
|
||||
# clean temp dir
|
||||
#
|
||||
rm -rf $HOME/.xbmc/temp/*
|
||||
#
|
||||
# clean temp dir
|
||||
#
|
||||
rm -rf $HOME/.xbmc/temp/*
|
||||
|
||||
#
|
||||
# add some default settings
|
||||
#
|
||||
mkdir -p $HOME/.xbmc/userdata
|
||||
#
|
||||
# add some default settings
|
||||
#
|
||||
mkdir -p $HOME/.xbmc/userdata
|
||||
|
||||
# use dds fanarts by default
|
||||
if [ ! -f $HOME/.xbmc/userdata/advancedsettings.xml ] ; then
|
||||
cat > $HOME/.xbmc/userdata/advancedsettings.xml << EOF
|
||||
# use dds fanarts by default
|
||||
if [ ! -f $HOME/.xbmc/userdata/advancedsettings.xml ] ; then
|
||||
cat > $HOME/.xbmc/userdata/advancedsettings.xml << EOF
|
||||
<advancedsettings>
|
||||
<useddsfanart>true</useddsfanart>
|
||||
<splash>false</splash>
|
||||
@ -49,21 +47,21 @@ case $RUNLEVEL in
|
||||
</samba>
|
||||
</advancedsettings>
|
||||
EOF
|
||||
fi
|
||||
fi
|
||||
|
||||
#
|
||||
# setup directories for XBMC sources
|
||||
#
|
||||
#
|
||||
# setup directories for XBMC sources
|
||||
#
|
||||
|
||||
[ ! -d "$HOME/music" ] && mkdir -p $HOME/music
|
||||
[ ! -d "$HOME/pictures" ] && mkdir -p $HOME/pictures
|
||||
[ ! -d "$HOME/tvshows" ] && mkdir -p $HOME/tvshows
|
||||
[ ! -d "$HOME/videos" ] && mkdir -p $HOME/videos
|
||||
[ ! -d "$HOME/music" ] && mkdir -p $HOME/music
|
||||
[ ! -d "$HOME/pictures" ] && mkdir -p $HOME/pictures
|
||||
[ ! -d "$HOME/tvshows" ] && mkdir -p $HOME/tvshows
|
||||
[ ! -d "$HOME/videos" ] && mkdir -p $HOME/videos
|
||||
|
||||
mkdir -p $HOME/.xbmc/userdata
|
||||
mkdir -p $HOME/.xbmc/userdata
|
||||
|
||||
if [ ! -f $HOME/.xbmc/userdata/sources.xml ] ; then
|
||||
cat > $HOME/.xbmc/userdata/sources.xml << EOF
|
||||
if [ ! -f $HOME/.xbmc/userdata/sources.xml ] ; then
|
||||
cat > $HOME/.xbmc/userdata/sources.xml << EOF
|
||||
<sources>
|
||||
<video>
|
||||
<default pathversion="1"></default>
|
||||
@ -92,49 +90,44 @@ EOF
|
||||
</pictures>
|
||||
</sources>
|
||||
EOF
|
||||
fi
|
||||
fi
|
||||
|
||||
#
|
||||
# common setup guisettings
|
||||
#
|
||||
#
|
||||
# common setup guisettings
|
||||
#
|
||||
|
||||
mkdir -p $HOME/.xbmc/userdata
|
||||
mkdir -p $HOME/.xbmc/userdata
|
||||
|
||||
[ ! -d "$HOME/screenshots" ] && mkdir -p $HOME/screenshots
|
||||
[ ! -d "$HOME/screenshots" ] && mkdir -p $HOME/screenshots
|
||||
|
||||
if [ ! -f $HOME/.xbmc/userdata/guisettings.xml ] ; then
|
||||
echo "<settings>" > $HOME/.xbmc/userdata/guisettings.xml
|
||||
if [ ! -f $HOME/.xbmc/userdata/guisettings.xml ] ; then
|
||||
echo "<settings>" > $HOME/.xbmc/userdata/guisettings.xml
|
||||
|
||||
cat >> $HOME/.xbmc/userdata/guisettings.xml << EOF
|
||||
cat >> $HOME/.xbmc/userdata/guisettings.xml << EOF
|
||||
<debug>
|
||||
<screenshotpath pathversion="1">$HOME/screenshots/</screenshotpath>
|
||||
</debug>
|
||||
EOF
|
||||
|
||||
#
|
||||
# include project specific options
|
||||
#
|
||||
#
|
||||
# include project specific options
|
||||
#
|
||||
|
||||
if [ -f /usr/share/xbmc/config/guisettings.xml ]; then
|
||||
cat /usr/share/xbmc/config/guisettings.xml >> $HOME/.xbmc/userdata/guisettings.xml
|
||||
fi
|
||||
if [ -f /usr/share/xbmc/config/guisettings.xml ]; then
|
||||
cat /usr/share/xbmc/config/guisettings.xml >> $HOME/.xbmc/userdata/guisettings.xml
|
||||
fi
|
||||
|
||||
#
|
||||
# common setup for amd and nvidia graphic
|
||||
#
|
||||
#
|
||||
# common setup for amd and nvidia graphic
|
||||
#
|
||||
|
||||
# Always sync to vblank
|
||||
if [ "$GPUTYPE" = "NVIDIA" -o "$GPUTYPE" = "AMD" ] ; then
|
||||
cat >> $HOME/.xbmc/userdata/guisettings.xml << EOF
|
||||
# Always sync to vblank
|
||||
if [ "$GPUTYPE" = "NVIDIA" -o "$GPUTYPE" = "AMD" ] ; then
|
||||
cat >> $HOME/.xbmc/userdata/guisettings.xml << EOF
|
||||
<videoscreen>
|
||||
<vsync>2</vsync>
|
||||
</videoscreen>
|
||||
EOF
|
||||
fi
|
||||
echo "</settings>" >> $HOME/.xbmc/userdata/guisettings.xml
|
||||
fi
|
||||
;;
|
||||
|
||||
poweroff|reboot)
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
echo "</settings>" >> $HOME/.xbmc/userdata/guisettings.xml
|
||||
fi
|
||||
|
||||
@ -22,73 +22,66 @@
|
||||
#
|
||||
# runlevels: openelec
|
||||
|
||||
case $RUNLEVEL in
|
||||
boot)
|
||||
LIRCDEV="/var/run/lirc/lircd"
|
||||
[ -e /var/run/lirc/lircd.irtrans ] && LIRCDEV="/var/run/lirc/lircd.irtrans"
|
||||
XBMC_ARGS="--standalone -fs --lircdev $LIRCDEV"
|
||||
LIRCDEV="/var/run/lirc/lircd"
|
||||
[ -e /var/run/lirc/lircd.irtrans ] && LIRCDEV="/var/run/lirc/lircd.irtrans"
|
||||
XBMC_ARGS="--standalone -fs --lircdev $LIRCDEV"
|
||||
|
||||
progress "starting XBMC"
|
||||
progress "starting XBMC"
|
||||
|
||||
# hack for Boxee Remote
|
||||
if $(cat /proc/bus/input/devices | grep Vendor=0471 | grep -q Product=20d9);then
|
||||
export SDL_MOUSE_RELATIVE=0
|
||||
fi
|
||||
# hack for Boxee Remote
|
||||
if $(cat /proc/bus/input/devices | grep Vendor=0471 | grep -q Product=20d9);then
|
||||
export SDL_MOUSE_RELATIVE=0
|
||||
fi
|
||||
|
||||
# hack: make addon-bins executable
|
||||
chmod +x /storage/.xbmc/addons/*/bin/* > /dev/null 2>&1
|
||||
# hack: make addon-bins executable
|
||||
chmod +x /storage/.xbmc/addons/*/bin/* > /dev/null 2>&1
|
||||
|
||||
# starting autostart script (will be removed later again, dont use it!!!)
|
||||
AUTOSTART="/storage/.config/autostart.sh"
|
||||
if [ -f $AUTOSTART ]; then
|
||||
echo "!!! AUTOSTART script detected !!!" >> /var/log/messages
|
||||
cat "$AUTOSTART" >> /var/log/messages
|
||||
echo "!!! -End of autostart script- !!!" >> /var/log/messages
|
||||
# starting autostart script (will be removed later again, dont use it!!!)
|
||||
AUTOSTART="/storage/.config/autostart.sh"
|
||||
if [ -f $AUTOSTART ]; then
|
||||
echo "!!! AUTOSTART script detected !!!" >> /var/log/messages
|
||||
cat "$AUTOSTART" >> /var/log/messages
|
||||
echo "!!! -End of autostart script- !!!" >> /var/log/messages
|
||||
|
||||
sh $AUTOSTART
|
||||
fi
|
||||
sh $AUTOSTART
|
||||
fi
|
||||
|
||||
# starting autoupdate
|
||||
[ -f /usr/bin/autoupdate ] && /usr/bin/autoupdate &
|
||||
# starting autoupdate
|
||||
[ -f /usr/bin/autoupdate ] && /usr/bin/autoupdate &
|
||||
|
||||
# waiting for Xorg to start
|
||||
wait_for_xorg
|
||||
# waiting for Xorg to start
|
||||
wait_for_xorg
|
||||
|
||||
# set cpu's to 'on demand'
|
||||
( usleep 15000000
|
||||
progress "set cpu's to 'on demand'"
|
||||
cpupower frequency-set -g ondemand > /dev/null 2>&1
|
||||
)&
|
||||
# set cpu's to 'on demand'
|
||||
( usleep 15000000
|
||||
progress "set cpu's to 'on demand'"
|
||||
cpupower frequency-set -g ondemand > /dev/null 2>&1
|
||||
)&
|
||||
|
||||
# starting XBMC
|
||||
while true; do
|
||||
# starting XBMC
|
||||
while true; do
|
||||
|
||||
DISPLAY=:0.0 /usr/lib/xbmc/xbmc.bin $XBMC_ARGS > /dev/null 2>&1
|
||||
RET=$?
|
||||
DISPLAY=:0.0 /usr/lib/xbmc/xbmc.bin $XBMC_ARGS > /dev/null 2>&1
|
||||
RET=$?
|
||||
|
||||
case "$RET" in
|
||||
0)
|
||||
RUNLEVEL="poweroff"
|
||||
;;
|
||||
64)
|
||||
RUNLEVEL="poweroff"
|
||||
;;
|
||||
66)
|
||||
RUNLEVEL="reboot"
|
||||
;;
|
||||
255)
|
||||
echo "Abnormal Exit. Exited with code $RET"
|
||||
echo "is Xorg running? check /var/log/Xorg.log"
|
||||
;;
|
||||
*)
|
||||
echo "Abnormal Exit. Exited with code $RET"
|
||||
;;
|
||||
esac
|
||||
case "$RET" in
|
||||
0)
|
||||
poweroff -f
|
||||
;;
|
||||
64)
|
||||
poweroff -f
|
||||
;;
|
||||
66)
|
||||
reboot
|
||||
;;
|
||||
255)
|
||||
echo "Abnormal Exit. Exited with code $RET"
|
||||
echo "is Xorg running? check /var/log/Xorg.log"
|
||||
;;
|
||||
*)
|
||||
echo "Abnormal Exit. Exited with code $RET"
|
||||
;;
|
||||
esac
|
||||
|
||||
usleep 250000
|
||||
done
|
||||
;;
|
||||
|
||||
poweroff|reboot)
|
||||
;;
|
||||
esac
|
||||
usleep 250000
|
||||
done
|
||||
|
||||
@ -22,19 +22,11 @@
|
||||
#
|
||||
# runlevels: openelec, textmode
|
||||
|
||||
case $RUNLEVEL in
|
||||
boot)
|
||||
(
|
||||
wait_for_network
|
||||
(
|
||||
wait_for_network
|
||||
|
||||
progress "Starting Avahi Daemon"
|
||||
mkdir -p /var/run/avahi-daemon
|
||||
avahi-daemon -D
|
||||
)&
|
||||
;;
|
||||
progress "Starting Avahi Daemon"
|
||||
|
||||
poweroff|reboot)
|
||||
progress "Starting Avahi Daemon"
|
||||
killall avahi-daemon
|
||||
;;
|
||||
esac
|
||||
mkdir -p /var/run/avahi-daemon
|
||||
avahi-daemon -D
|
||||
)&
|
||||
|
||||
@ -22,182 +22,175 @@
|
||||
#
|
||||
# runlevels: openelec, installer, textmode
|
||||
|
||||
case $RUNLEVEL in
|
||||
boot)
|
||||
if [ -f /var/config/settings.conf ]; then
|
||||
. /var/config/settings.conf
|
||||
if [ -f /var/config/settings.conf ]; then
|
||||
. /var/config/settings.conf
|
||||
|
||||
# save original interface names (eth0, eth1)
|
||||
NET_IFACE_NAME=$NET_IFACE
|
||||
NET2_IFACE_NAME=$NET2_IFACE
|
||||
# save original interface names (eth0, eth1)
|
||||
NET_IFACE_NAME=$NET_IFACE
|
||||
NET2_IFACE_NAME=$NET2_IFACE
|
||||
fi
|
||||
|
||||
[ -z "$NET_HOSTNAME" ] && NET_HOSTNAME="openelec"
|
||||
|
||||
# setup hostname
|
||||
progress "Setup hostname"
|
||||
echo "$NET_HOSTNAME" > /proc/sys/kernel/hostname
|
||||
|
||||
# create /etc/hosts file, useful for gethostbyname(localhost)
|
||||
progress "creating /etc/hosts"
|
||||
echo -e "127.0.0.1\tlocalhost $NET_HOSTNAME" > /etc/hosts
|
||||
|
||||
# add user defined hosts.conf entry's
|
||||
[ -f $HOME/.config/hosts.conf ] && cat $HOME/.config/hosts.conf >> /etc/hosts
|
||||
|
||||
(
|
||||
# setup Networking 1
|
||||
progress "setup Networking 1"
|
||||
|
||||
CONNMAN_PROFILE="/var/lib/connman/default.profile"
|
||||
|
||||
mkdir -p /var/run/connman
|
||||
mkdir -p /var/lib/connman
|
||||
|
||||
# NETWORK 1: ( LAN / WLAN )
|
||||
for i in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30; do
|
||||
if [ ! -f /sys/class/net/$NET_IFACE/address ]; then
|
||||
logger -t Connman "### [$i] cannot find /sys/class/net/$NET_IFACE/address ###"
|
||||
else
|
||||
logger -t Connman "### [$i] found /sys/class/net/$NET_IFACE/address, continue ###"
|
||||
NET_IFACE=`cat /sys/class/net/$NET_IFACE/address | sed 's/://g'`
|
||||
break
|
||||
fi
|
||||
usleep 500000
|
||||
done
|
||||
|
||||
if [ "$NET_NETWORK" = "WLAN" -a -n "$NET_SSID" ]; then
|
||||
NET_SSID_HEX=`echo -n "$NET_SSID" | od -tx1 | cut -c8-| tr -d ' \n'`
|
||||
|
||||
# NET_SECURITY: ( NONE / WEP / WPA/WPA2 )
|
||||
if [ "$NET_SECURITY" = "WEP" -a -n "$NET_PASSPHRASE" ]; then
|
||||
MODE="managed_wep"
|
||||
elif [ "$NET_SECURITY" = "WPA/WPA2" -a -n "$NET_PASSPHRASE" ]; then
|
||||
MODE="managed_psk"
|
||||
else
|
||||
MODE="managed_none"
|
||||
fi
|
||||
|
||||
if [ "$NET_HIDDEN" = "true" ]; then
|
||||
echo "[wifi_${NET_IFACE}_hidden_${MODE}]" > $CONNMAN_PROFILE
|
||||
else
|
||||
echo "[wifi_${NET_IFACE}_${NET_SSID_HEX}_${MODE}]" > $CONNMAN_PROFILE
|
||||
fi
|
||||
|
||||
echo "Name=$NET_SSID" >> $CONNMAN_PROFILE
|
||||
echo "SSID=$NET_SSID_HEX" >> $CONNMAN_PROFILE
|
||||
[ -n "$NET_PASSPHRASE" ] && echo "Passphrase=$NET_PASSPHRASE" >> $CONNMAN_PROFILE
|
||||
echo "Favorite=true" >> $CONNMAN_PROFILE
|
||||
echo "AutoConnect=true" >> $CONNMAN_PROFILE
|
||||
else
|
||||
MODE="cable"
|
||||
echo "[ethernet_${NET_IFACE}_${MODE}]" > $CONNMAN_PROFILE
|
||||
fi
|
||||
|
||||
[ -z "$NET_HOSTNAME" ] && NET_HOSTNAME="openelec"
|
||||
# IP settings
|
||||
if [ -z "$NET_IPADDRESS" ]; then
|
||||
echo "IPv4.method=dhcp" >> $CONNMAN_PROFILE
|
||||
else
|
||||
echo "IPv4.method=manual" >> $CONNMAN_PROFILE
|
||||
echo "IPv4.local_address=$NET_IPADDRESS" >> $CONNMAN_PROFILE
|
||||
[ -n "$NET_PREFIXLEN" ] && echo "IPv4.netmask_prefixlen=$NET_PREFIXLEN" >> $CONNMAN_PROFILE
|
||||
[ -n "$NET_GATEWAY" ] && echo "IPv4.gateway=$NET_GATEWAY" >> $CONNMAN_PROFILE
|
||||
fi
|
||||
|
||||
# setup hostname
|
||||
progress "Setup hostname"
|
||||
echo "$NET_HOSTNAME" > /proc/sys/kernel/hostname
|
||||
[ -n "$NET_DNS1" ] && NET_NAMESERVER="$NET_DNS1"
|
||||
[ -n "$NET_DNS2" ] && NET_NAMESERVER="$NET_NAMESERVER;$NET_DNS2"
|
||||
[ -n "$NET_DNS3" ] && NET_NAMESERVER="$NET_NAMESERVER;$NET_DNS3"
|
||||
[ -n "$NET_NAMESERVER" ] && echo "Nameservers=$NET_NAMESERVER;" >> $CONNMAN_PROFILE
|
||||
|
||||
# create /etc/hosts file, useful for gethostbyname(localhost)
|
||||
progress "creating /etc/hosts"
|
||||
echo -e "127.0.0.1\tlocalhost $NET_HOSTNAME" > /etc/hosts
|
||||
# END OF NETWORK 1
|
||||
|
||||
# add user defined hosts.conf entry's
|
||||
[ -f $HOME/.config/hosts.conf ] && cat $HOME/.config/hosts.conf >> /etc/hosts
|
||||
|
||||
(
|
||||
# setup Networking 1
|
||||
progress "setup Networking 1"
|
||||
|
||||
CONNMAN_PROFILE="/var/lib/connman/default.profile"
|
||||
|
||||
mkdir -p /var/run/connman
|
||||
mkdir -p /var/lib/connman
|
||||
|
||||
# NETWORK 1: ( LAN / WLAN )
|
||||
for i in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30; do
|
||||
if [ ! -f /sys/class/net/$NET_IFACE/address ]; then
|
||||
logger -t Connman "### [$i] cannot find /sys/class/net/$NET_IFACE/address ###"
|
||||
else
|
||||
logger -t Connman "### [$i] found /sys/class/net/$NET_IFACE/address, continue ###"
|
||||
NET_IFACE=`cat /sys/class/net/$NET_IFACE/address | sed 's/://g'`
|
||||
break
|
||||
fi
|
||||
usleep 500000
|
||||
done
|
||||
|
||||
if [ "$NET_NETWORK" = "WLAN" -a -n "$NET_SSID" ]; then
|
||||
NET_SSID_HEX=`echo -n "$NET_SSID" | od -tx1 | cut -c8-| tr -d ' \n'`
|
||||
|
||||
# NET_SECURITY: ( NONE / WEP / WPA/WPA2 )
|
||||
if [ "$NET_SECURITY" = "WEP" -a -n "$NET_PASSPHRASE" ]; then
|
||||
MODE="managed_wep"
|
||||
elif [ "$NET_SECURITY" = "WPA/WPA2" -a -n "$NET_PASSPHRASE" ]; then
|
||||
MODE="managed_psk"
|
||||
else
|
||||
MODE="managed_none"
|
||||
fi
|
||||
|
||||
if [ "$NET_HIDDEN" = "true" ]; then
|
||||
echo "[wifi_${NET_IFACE}_hidden_${MODE}]" > $CONNMAN_PROFILE
|
||||
else
|
||||
echo "[wifi_${NET_IFACE}_${NET_SSID_HEX}_${MODE}]" > $CONNMAN_PROFILE
|
||||
fi
|
||||
|
||||
echo "Name=$NET_SSID" >> $CONNMAN_PROFILE
|
||||
echo "SSID=$NET_SSID_HEX" >> $CONNMAN_PROFILE
|
||||
[ -n "$NET_PASSPHRASE" ] && echo "Passphrase=$NET_PASSPHRASE" >> $CONNMAN_PROFILE
|
||||
echo "Favorite=true" >> $CONNMAN_PROFILE
|
||||
echo "AutoConnect=true" >> $CONNMAN_PROFILE
|
||||
else
|
||||
MODE="cable"
|
||||
echo "[ethernet_${NET_IFACE}_${MODE}]" > $CONNMAN_PROFILE
|
||||
fi
|
||||
|
||||
# IP settings
|
||||
if [ -z "$NET_IPADDRESS" ]; then
|
||||
echo "IPv4.method=dhcp" >> $CONNMAN_PROFILE
|
||||
else
|
||||
echo "IPv4.method=manual" >> $CONNMAN_PROFILE
|
||||
echo "IPv4.local_address=$NET_IPADDRESS" >> $CONNMAN_PROFILE
|
||||
[ -n "$NET_PREFIXLEN" ] && echo "IPv4.netmask_prefixlen=$NET_PREFIXLEN" >> $CONNMAN_PROFILE
|
||||
[ -n "$NET_GATEWAY" ] && echo "IPv4.gateway=$NET_GATEWAY" >> $CONNMAN_PROFILE
|
||||
fi
|
||||
|
||||
[ -n "$NET_DNS1" ] && NET_NAMESERVER="$NET_DNS1"
|
||||
[ -n "$NET_DNS2" ] && NET_NAMESERVER="$NET_NAMESERVER;$NET_DNS2"
|
||||
[ -n "$NET_DNS3" ] && NET_NAMESERVER="$NET_NAMESERVER;$NET_DNS3"
|
||||
[ -n "$NET_NAMESERVER" ] && echo "Nameservers=$NET_NAMESERVER;" >> $CONNMAN_PROFILE
|
||||
|
||||
# END OF NETWORK 1
|
||||
|
||||
# NETWORK 2: ( LAN / WLAN )
|
||||
if [ -n "$NET2_NETWORK" -a "$NET2_NETWORK" != "NONE" -a "$NET2_IFACE_NAME" != "$NET_IFACE_NAME" ]; then
|
||||
# setup Networking 2
|
||||
progress "setup Networking 2"
|
||||
|
||||
for i in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30; do
|
||||
if [ ! -f /sys/class/net/$NET2_IFACE/address ]; then
|
||||
logger -t Connman "### [$i] cannot find /sys/class/net/$NET2_IFACE/address ###"
|
||||
else
|
||||
logger -t Connman "### [$i] found /sys/class/net/$NET2_IFACE/address, continue ###"
|
||||
NET2_IFACE=`cat /sys/class/net/$NET2_IFACE/address | sed 's/://g'`
|
||||
break
|
||||
fi
|
||||
usleep 500000
|
||||
done
|
||||
|
||||
if [ "$NET2_NETWORK" = "WLAN" -a -n "$NET2_SSID" ]; then
|
||||
NET2_SSID_HEX=`echo -n "$NET2_SSID" | od -tx1 | cut -c8-| tr -d ' \n'`
|
||||
|
||||
# NET_SECURITY: ( NONE / WEP / WPA/WPA2 )
|
||||
if [ "$NET2_SECURITY" = "WEP" -a -n "$NET2_PASSPHRASE" ]; then
|
||||
MODE="managed_wep"
|
||||
elif [ "$NET2_SECURITY" = "WPA/WPA2" -a -n "$NET2_PASSPHRASE" ]; then
|
||||
MODE="managed_psk"
|
||||
else
|
||||
MODE="managed_none"
|
||||
fi
|
||||
|
||||
if [ "$NET2_HIDDEN" = "true" ]; then
|
||||
echo "[wifi_${NET2_IFACE}_hidden_${MODE}]" >> $CONNMAN_PROFILE
|
||||
else
|
||||
echo "[wifi_${NET2_IFACE}_${NET2_SSID_HEX}_${MODE}]" >> $CONNMAN_PROFILE
|
||||
fi
|
||||
|
||||
echo "Name=$NET2_SSID" >> $CONNMAN_PROFILE
|
||||
echo "SSID=$NET2_SSID_HEX" >> $CONNMAN_PROFILE
|
||||
[ -n "$NET2_PASSPHRASE" ] && echo "Passphrase=$NET2_PASSPHRASE" >> $CONNMAN_PROFILE
|
||||
echo "Favorite=true" >> $CONNMAN_PROFILE
|
||||
echo "AutoConnect=true" >> $CONNMAN_PROFILE
|
||||
else
|
||||
MODE="cable"
|
||||
echo "[ethernet_${NET2_IFACE}_${MODE}]" >> $CONNMAN_PROFILE
|
||||
fi
|
||||
|
||||
# IP settings
|
||||
if [ -z "$NET2_IPADDRESS" ]; then
|
||||
echo "IPv4.method=dhcp" >> $CONNMAN_PROFILE
|
||||
else
|
||||
echo "IPv4.method=manual" >> $CONNMAN_PROFILE
|
||||
echo "IPv4.local_address=$NET2_IPADDRESS" >> $CONNMAN_PROFILE
|
||||
[ -n "$NET2_PREFIXLEN" ] && echo "IPv4.netmask_prefixlen=$NET2_PREFIXLEN" >> $CONNMAN_PROFILE
|
||||
[ -n "$NET2_GATEWAY" ] && echo "IPv4.gateway=$NET2_GATEWAY" >> $CONNMAN_PROFILE
|
||||
fi
|
||||
|
||||
[ -n "$NET2_DNS1" ] && NET2_NAMESERVER="$NET2_DNS1"
|
||||
[ -n "$NET2_DNS2" ] && NET2_NAMESERVER="$NET2_NAMESERVER;$NET2_DNS2"
|
||||
[ -n "$NET2_DNS3" ] && NET2_NAMESERVER="$NET2_NAMESERVER;$NET2_DNS3"
|
||||
[ -n "$NET2_NAMESERVER" ] && echo "Nameservers=$NET2_NAMESERVER;" >> $CONNMAN_PROFILE
|
||||
|
||||
(
|
||||
# wait some time, put eth1 (NET2_IFACE) down and then up
|
||||
# this is just temporary solution until I figure out how to
|
||||
# do properly with connman
|
||||
usleep 5000000
|
||||
ifconfig $NET2_IFACE_NAME down
|
||||
usleep 1000000
|
||||
ifconfig $NET2_IFACE_NAME up
|
||||
)&
|
||||
# NETWORK 2: ( LAN / WLAN )
|
||||
if [ -n "$NET2_NETWORK" -a "$NET2_NETWORK" != "NONE" -a "$NET2_IFACE_NAME" != "$NET_IFACE_NAME" ]; then
|
||||
# setup Networking 2
|
||||
progress "setup Networking 2"
|
||||
|
||||
for i in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30; do
|
||||
if [ ! -f /sys/class/net/$NET2_IFACE/address ]; then
|
||||
logger -t Connman "### [$i] cannot find /sys/class/net/$NET2_IFACE/address ###"
|
||||
else
|
||||
logger -t Connman "### [$i] found /sys/class/net/$NET2_IFACE/address, continue ###"
|
||||
NET2_IFACE=`cat /sys/class/net/$NET2_IFACE/address | sed 's/://g'`
|
||||
break
|
||||
fi
|
||||
# END OF NETWORK 2
|
||||
usleep 500000
|
||||
done
|
||||
|
||||
# overwrite created profile with custom one if exist (debug use only)
|
||||
DEBUG_CONNMAN_PROFILE="/storage/.config/connman.profile"
|
||||
[ -f "$DEBUG_CONNMAN_PROFILE" ] && cp $DEBUG_CONNMAN_PROFILE $CONNMAN_PROFILE
|
||||
[ -f "$DEBUG_CONNMAN_PROFILE" ] && mv $DEBUG_CONNMAN_PROFILE ${DEBUG_CONNMAN_PROFILE}_saved
|
||||
if [ "$NET2_NETWORK" = "WLAN" -a -n "$NET2_SSID" ]; then
|
||||
NET2_SSID_HEX=`echo -n "$NET2_SSID" | od -tx1 | cut -c8-| tr -d ' \n'`
|
||||
|
||||
# starting Connection manager
|
||||
progress "starting Connection manager"
|
||||
# NET_SECURITY: ( NONE / WEP / WPA/WPA2 )
|
||||
if [ "$NET2_SECURITY" = "WEP" -a -n "$NET2_PASSPHRASE" ]; then
|
||||
MODE="managed_wep"
|
||||
elif [ "$NET2_SECURITY" = "WPA/WPA2" -a -n "$NET2_PASSPHRASE" ]; then
|
||||
MODE="managed_psk"
|
||||
else
|
||||
MODE="managed_none"
|
||||
fi
|
||||
|
||||
while true; do
|
||||
/usr/sbin/connmand -n > /dev/null 2>&1
|
||||
usleep 250000
|
||||
done
|
||||
)&
|
||||
;;
|
||||
if [ "$NET2_HIDDEN" = "true" ]; then
|
||||
echo "[wifi_${NET2_IFACE}_hidden_${MODE}]" >> $CONNMAN_PROFILE
|
||||
else
|
||||
echo "[wifi_${NET2_IFACE}_${NET2_SSID_HEX}_${MODE}]" >> $CONNMAN_PROFILE
|
||||
fi
|
||||
|
||||
poweroff|reboot)
|
||||
;;
|
||||
esac
|
||||
echo "Name=$NET2_SSID" >> $CONNMAN_PROFILE
|
||||
echo "SSID=$NET2_SSID_HEX" >> $CONNMAN_PROFILE
|
||||
[ -n "$NET2_PASSPHRASE" ] && echo "Passphrase=$NET2_PASSPHRASE" >> $CONNMAN_PROFILE
|
||||
echo "Favorite=true" >> $CONNMAN_PROFILE
|
||||
echo "AutoConnect=true" >> $CONNMAN_PROFILE
|
||||
else
|
||||
MODE="cable"
|
||||
echo "[ethernet_${NET2_IFACE}_${MODE}]" >> $CONNMAN_PROFILE
|
||||
fi
|
||||
|
||||
# IP settings
|
||||
if [ -z "$NET2_IPADDRESS" ]; then
|
||||
echo "IPv4.method=dhcp" >> $CONNMAN_PROFILE
|
||||
else
|
||||
echo "IPv4.method=manual" >> $CONNMAN_PROFILE
|
||||
echo "IPv4.local_address=$NET2_IPADDRESS" >> $CONNMAN_PROFILE
|
||||
[ -n "$NET2_PREFIXLEN" ] && echo "IPv4.netmask_prefixlen=$NET2_PREFIXLEN" >> $CONNMAN_PROFILE
|
||||
[ -n "$NET2_GATEWAY" ] && echo "IPv4.gateway=$NET2_GATEWAY" >> $CONNMAN_PROFILE
|
||||
fi
|
||||
|
||||
[ -n "$NET2_DNS1" ] && NET2_NAMESERVER="$NET2_DNS1"
|
||||
[ -n "$NET2_DNS2" ] && NET2_NAMESERVER="$NET2_NAMESERVER;$NET2_DNS2"
|
||||
[ -n "$NET2_DNS3" ] && NET2_NAMESERVER="$NET2_NAMESERVER;$NET2_DNS3"
|
||||
[ -n "$NET2_NAMESERVER" ] && echo "Nameservers=$NET2_NAMESERVER;" >> $CONNMAN_PROFILE
|
||||
|
||||
(
|
||||
# wait some time, put eth1 (NET2_IFACE) down and then up
|
||||
# this is just temporary solution until I figure out how to
|
||||
# do properly with connman
|
||||
usleep 5000000
|
||||
ifconfig $NET2_IFACE_NAME down
|
||||
usleep 1000000
|
||||
ifconfig $NET2_IFACE_NAME up
|
||||
)&
|
||||
|
||||
fi
|
||||
# END OF NETWORK 2
|
||||
|
||||
# overwrite created profile with custom one if exist (debug use only)
|
||||
DEBUG_CONNMAN_PROFILE="/storage/.config/connman.profile"
|
||||
[ -f "$DEBUG_CONNMAN_PROFILE" ] && cp $DEBUG_CONNMAN_PROFILE $CONNMAN_PROFILE
|
||||
[ -f "$DEBUG_CONNMAN_PROFILE" ] && mv $DEBUG_CONNMAN_PROFILE ${DEBUG_CONNMAN_PROFILE}_saved
|
||||
|
||||
# starting Connection manager
|
||||
progress "starting Connection manager"
|
||||
|
||||
while true; do
|
||||
/usr/sbin/connmand -n > /dev/null 2>&1
|
||||
usleep 250000
|
||||
done
|
||||
)&
|
||||
|
||||
@ -22,16 +22,9 @@
|
||||
#
|
||||
# runlevels: openelec, textmode
|
||||
|
||||
case $RUNLEVEL in
|
||||
boot)
|
||||
(
|
||||
wait_for_network
|
||||
(
|
||||
wait_for_network
|
||||
|
||||
progress "mounting Network shares"
|
||||
netmount > /dev/null 2>&1
|
||||
)&
|
||||
;;
|
||||
|
||||
poweroff|reboot)
|
||||
;;
|
||||
esac
|
||||
progress "mounting Network shares"
|
||||
netmount > /dev/null 2>&1
|
||||
)&
|
||||
|
||||
@ -22,63 +22,55 @@
|
||||
#
|
||||
# runlevels: openelec, textmode
|
||||
|
||||
RSA1_KEY="/storage/.cache/ssh/ssh_host_key"
|
||||
RSA2_KEY="/storage/.cache/ssh/ssh_host_rsa_key"
|
||||
DSA2_KEY="/storage/.cache/ssh/ssh_host_dsa_key"
|
||||
(
|
||||
RSA1_KEY="/storage/.cache/ssh/ssh_host_key"
|
||||
RSA2_KEY="/storage/.cache/ssh/ssh_host_rsa_key"
|
||||
DSA2_KEY="/storage/.cache/ssh/ssh_host_dsa_key"
|
||||
|
||||
KEYGEN="/usr/bin/ssh-keygen"
|
||||
SSHD="/usr/sbin/sshd"
|
||||
KEYGEN="/usr/bin/ssh-keygen"
|
||||
SSHD="/usr/sbin/sshd"
|
||||
|
||||
case $RUNLEVEL in
|
||||
boot)
|
||||
(
|
||||
# Check for the SSH1 RSA key
|
||||
if [ ! -f $RSA1_KEY ] ; then
|
||||
progress "SSH: generating SSH1 RSA key"
|
||||
# Check for the SSH1 RSA key
|
||||
if [ ! -f $RSA1_KEY ] ; then
|
||||
progress "SSH: generating SSH1 RSA key"
|
||||
|
||||
mkdir -p /storage/.cache/ssh
|
||||
$KEYGEN -q -t rsa1 -f $RSA1_KEY -C '' -N '' >&/dev/null
|
||||
chmod 600 $RSA1_KEY
|
||||
fi
|
||||
mkdir -p /storage/.cache/ssh
|
||||
$KEYGEN -q -t rsa1 -f $RSA1_KEY -C '' -N '' >&/dev/null
|
||||
chmod 600 $RSA1_KEY
|
||||
fi
|
||||
|
||||
# Check for the SSH2 RSA key
|
||||
if [ ! -f $RSA2_KEY ] ; then
|
||||
progress "SSH: generating SSH2 RSA key"
|
||||
# Check for the SSH2 RSA key
|
||||
if [ ! -f $RSA2_KEY ] ; then
|
||||
progress "SSH: generating SSH2 RSA key"
|
||||
|
||||
mkdir -p /storage/.cache/ssh
|
||||
$KEYGEN -q -t rsa -f $RSA2_KEY -C '' -N '' >&/dev/null
|
||||
chmod 600 $RSA2_KEY
|
||||
fi
|
||||
mkdir -p /storage/.cache/ssh
|
||||
$KEYGEN -q -t rsa -f $RSA2_KEY -C '' -N '' >&/dev/null
|
||||
chmod 600 $RSA2_KEY
|
||||
fi
|
||||
|
||||
# Check for the SSH2 DSA key
|
||||
if [ ! -f $DSA2_KEY ] ; then
|
||||
progress "SSH: generating SSH2 DSA key"
|
||||
# Check for the SSH2 DSA key
|
||||
if [ ! -f $DSA2_KEY ] ; then
|
||||
progress "SSH: generating SSH2 DSA key"
|
||||
|
||||
mkdir -p /storage/.cache/ssh
|
||||
$KEYGEN -q -t dsa -f $DSA2_KEY -C '' -N '' >&/dev/null
|
||||
chmod 600 $DSA2_KEY
|
||||
fi
|
||||
mkdir -p /storage/.cache/ssh
|
||||
$KEYGEN -q -t dsa -f $DSA2_KEY -C '' -N '' >&/dev/null
|
||||
chmod 600 $DSA2_KEY
|
||||
fi
|
||||
|
||||
# Check for predifined known hosts file
|
||||
if [ -f /etc/ssh/known_hosts -a ! -f $HOME/.ssh/known_hosts ] ; then
|
||||
progress "SSH: setup predifined known hosts"
|
||||
# Check for predifined known hosts file
|
||||
if [ -f /etc/ssh/known_hosts -a ! -f $HOME/.ssh/known_hosts ] ; then
|
||||
progress "SSH: setup predifined known hosts"
|
||||
|
||||
mkdir -p /$HOME/.ssh
|
||||
cp /etc/ssh/known_hosts $HOME/.ssh
|
||||
fi
|
||||
mkdir -p /$HOME/.ssh
|
||||
cp /etc/ssh/known_hosts $HOME/.ssh
|
||||
fi
|
||||
|
||||
progress "Starting SSH Server"
|
||||
progress "Starting SSH Server"
|
||||
|
||||
wait_for_network
|
||||
wait_for_network
|
||||
|
||||
mkdir -p /var/empty
|
||||
chmod -R 600 /var/empty
|
||||
$SSHD
|
||||
)&
|
||||
;;
|
||||
mkdir -p /var/empty
|
||||
chmod -R 600 /var/empty
|
||||
$SSHD
|
||||
|
||||
poweroff|reboot)
|
||||
progress "Stopping SSH Server"
|
||||
killall sshd
|
||||
;;
|
||||
esac
|
||||
)&
|
||||
|
||||
@ -22,38 +22,28 @@
|
||||
#
|
||||
# runlevels: openelec, textmode
|
||||
|
||||
SMB_USERCONF="/storage/.config/samba.conf"
|
||||
SMB_DEFCONF="/etc/samba/smb.conf"
|
||||
(
|
||||
if [ -f /var/config/settings.conf ]; then
|
||||
. /var/config/settings.conf
|
||||
|
||||
case $RUNLEVEL in
|
||||
boot)
|
||||
(
|
||||
if [ -f /var/config/settings.conf ]; then
|
||||
. /var/config/settings.conf
|
||||
if [ "$SAMBA_START" = "true" ]; then
|
||||
|
||||
if [ "$SAMBA_START" = "true" ]; then
|
||||
wait_for_network
|
||||
|
||||
wait_for_network
|
||||
progress "Starting Samba server"
|
||||
|
||||
progress "Starting Samba server"
|
||||
SMB_USERCONF="/storage/.config/samba.conf"
|
||||
SMB_DEFCONF="/etc/samba/smb.conf"
|
||||
|
||||
if [ -f $SMB_USERCONF ]; then
|
||||
SMB_ARG="--configfile=$SMB_USERCONF"
|
||||
else
|
||||
SMB_ARG="--configfile=$SMB_DEFCONF"
|
||||
fi
|
||||
|
||||
mkdir -p /var/log/samba
|
||||
smbd --daemon $SMB_ARG > /dev/null 2>&1
|
||||
nmbd --daemon $SMB_ARG > /dev/null 2>&1
|
||||
fi
|
||||
if [ -f $SMB_USERCONF ]; then
|
||||
SMB_ARG="--configfile=$SMB_USERCONF"
|
||||
else
|
||||
SMB_ARG="--configfile=$SMB_DEFCONF"
|
||||
fi
|
||||
)&
|
||||
;;
|
||||
|
||||
poweroff|reboot)
|
||||
progress "Stopping Samba server"
|
||||
killall nmbd
|
||||
killall smbd
|
||||
;;
|
||||
esac
|
||||
mkdir -p /var/log/samba
|
||||
smbd --daemon $SMB_ARG > /dev/null 2>&1
|
||||
nmbd --daemon $SMB_ARG > /dev/null 2>&1
|
||||
fi
|
||||
fi
|
||||
)&
|
||||
|
||||
@ -22,14 +22,8 @@
|
||||
#
|
||||
# runlevels: openelec, textmode
|
||||
|
||||
case $RUNLEVEL in
|
||||
boot)
|
||||
progress "starting ConsoleKit daemon"
|
||||
progress "starting ConsoleKit daemon"
|
||||
|
||||
install -m 755 -d /var/log/ConsoleKit
|
||||
install -m 755 -d /var/run/ConsoleKit
|
||||
;;
|
||||
install -m 755 -d /var/log/ConsoleKit
|
||||
install -m 755 -d /var/run/ConsoleKit
|
||||
|
||||
poweroff|reboot)
|
||||
;;
|
||||
esac
|
||||
|
||||
@ -20,20 +20,4 @@
|
||||
# http://www.gnu.org/copyleft/gpl.html
|
||||
################################################################################
|
||||
|
||||
. /etc/profile
|
||||
|
||||
progress "Reboot the syste"
|
||||
RET=0
|
||||
|
||||
RUNLEVEL="reboot"
|
||||
|
||||
for script in `ls -r1 /etc/init.d/*`; do
|
||||
if grep -q -e "^# runlevels:.*$MODE" $script; then
|
||||
. $script
|
||||
S_RET=$?
|
||||
test $S_RET -ge $RET && RET=$S_RET
|
||||
fi
|
||||
done
|
||||
|
||||
sync
|
||||
reboot
|
||||
reboot
|
||||
|
||||
@ -20,20 +20,4 @@
|
||||
# http://www.gnu.org/copyleft/gpl.html
|
||||
################################################################################
|
||||
|
||||
. /etc/profile
|
||||
|
||||
progress "Poweroff the system"
|
||||
RET=0
|
||||
|
||||
RUNLEVEL="poweroff"
|
||||
|
||||
for script in `ls -r1 /etc/init.d/*`; do
|
||||
if grep -q -e "^# runlevels:.*$MODE" $script; then
|
||||
. $script
|
||||
S_RET=$?
|
||||
test $S_RET -ge $RET && RET=$S_RET
|
||||
fi
|
||||
done
|
||||
|
||||
sync
|
||||
poweroff -f
|
||||
poweroff
|
||||
|
||||
@ -23,31 +23,5 @@
|
||||
#
|
||||
# runlevels: openelec, installer, textmode
|
||||
|
||||
case $RUNLEVEL in
|
||||
boot)
|
||||
progress "mounting needed filesystems"
|
||||
mount -n -t devtmpfs none /dev
|
||||
mkdir -p /dev/pts
|
||||
mount -n -t devpts -o gid=5,mode=620 none /dev/pts
|
||||
mkdir -p /dev/shm
|
||||
mount -n -t tmpfs none /dev/shm
|
||||
mount -n -t tmpfs none /run
|
||||
mount -n -t ramfs none /var
|
||||
mount "$disk" /storage -o rw,noatime > /dev/null 2>&1
|
||||
;;
|
||||
|
||||
poweroff|reboot)
|
||||
progress "unmounting filesystems"
|
||||
for i in 1 2 3 4 5 6 7 8 9 10; do
|
||||
echo "umount /storage"
|
||||
ERR_ENV=1
|
||||
umount /storage
|
||||
[ "$?" -eq "0" ] && ERR_ENV=0 && break
|
||||
usleep 1000000
|
||||
done
|
||||
if [ "$ERR_ENV" -ne "0" ]; then
|
||||
mount -o remount,ro /storage
|
||||
umount -l /storage
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
progress "mounting needed filesystems"
|
||||
mount -n -t ramfs none /var
|
||||
|
||||
@ -23,47 +23,38 @@
|
||||
#
|
||||
# runlevels: openelec, installer, textmode
|
||||
|
||||
case $RUNLEVEL in
|
||||
boot)
|
||||
progress "make variable directory structure"
|
||||
mkdir -p /var/cache \
|
||||
/var/lock \
|
||||
/var/media \
|
||||
/var/run \
|
||||
/var/tmp \
|
||||
/var/run/sepermit \
|
||||
/var/run/lirc
|
||||
progress "make variable directory structure"
|
||||
mkdir -p /var/cache \
|
||||
/var/lock \
|
||||
/var/media \
|
||||
/var/run \
|
||||
/var/tmp \
|
||||
/var/run/sepermit \
|
||||
/var/run/lirc
|
||||
|
||||
chmod 1777 /var/run /var/tmp
|
||||
chmod 1777 /var/run /var/tmp
|
||||
|
||||
touch /var/run/utmp
|
||||
chmod 1777 /var/run/utmp
|
||||
touch /var/run/utmp
|
||||
chmod 1777 /var/run/utmp
|
||||
|
||||
if test "$DEBUG" = "yes"; then
|
||||
mkdir -p $HOME/log
|
||||
ln -sf $HOME/log /var/log
|
||||
else
|
||||
mkdir -p /var/log
|
||||
fi
|
||||
if test "$DEBUG" = "yes"; then
|
||||
mkdir -p $HOME/log
|
||||
ln -sf $HOME/log /var/log
|
||||
else
|
||||
mkdir -p /var/log
|
||||
fi
|
||||
|
||||
touch /var/log/wtmp
|
||||
chmod 1777 /var/log/wtmp
|
||||
|
||||
# others:
|
||||
mkdir -p /var/lib/polkit-1
|
||||
chmod 700 /var/lib/polkit-1
|
||||
mkdir -p /var/lib/polkit-1/localauthority/10-vendor.d
|
||||
mkdir -p /var/lib/polkit-1/localauthority/20-org.d
|
||||
mkdir -p /var/lib/polkit-1/localauthority/30-site.d
|
||||
mkdir -p /var/lib/polkit-1/localauthority/50-local.d
|
||||
mkdir -p /var/lib/polkit-1/localauthority/90-mandatory.d
|
||||
|
||||
mkdir -p /var/lib/udisks
|
||||
mkdir -p /var/lib/upower
|
||||
;;
|
||||
|
||||
poweroff|reboot)
|
||||
;;
|
||||
esac
|
||||
touch /var/log/wtmp
|
||||
chmod 1777 /var/log/wtmp
|
||||
|
||||
# others:
|
||||
mkdir -p /var/lib/polkit-1
|
||||
chmod 700 /var/lib/polkit-1
|
||||
mkdir -p /var/lib/polkit-1/localauthority/10-vendor.d
|
||||
mkdir -p /var/lib/polkit-1/localauthority/20-org.d
|
||||
mkdir -p /var/lib/polkit-1/localauthority/30-site.d
|
||||
mkdir -p /var/lib/polkit-1/localauthority/50-local.d
|
||||
mkdir -p /var/lib/polkit-1/localauthority/90-mandatory.d
|
||||
|
||||
mkdir -p /var/lib/udisks
|
||||
mkdir -p /var/lib/upower
|
||||
|
||||
@ -25,18 +25,13 @@
|
||||
TTY="3"
|
||||
|
||||
if [ "$DEBUG" = "yes" ]; then
|
||||
case $RUNLEVEL in
|
||||
boot)
|
||||
echo "###########################################"
|
||||
echo "## it seems we are running in Debug mode ##"
|
||||
echo "## starting debugging shell on console $TTY ##"
|
||||
echo "## ...... switch with ctrl-alt-f$TTY ...... ##"
|
||||
echo "###########################################"
|
||||
|
||||
openvt -w -c $TTY /bin/sh &
|
||||
;;
|
||||
echo "###########################################"
|
||||
echo "## it seems we are running in Debug mode ##"
|
||||
echo "## starting debugging shell on console $TTY ##"
|
||||
echo "## ...... switch with ctrl-alt-f$TTY ...... ##"
|
||||
echo "###########################################"
|
||||
|
||||
openvt -w -c $TTY /bin/sh &
|
||||
|
||||
poweroff|reboot)
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
|
||||
@ -25,16 +25,9 @@
|
||||
|
||||
OPENELEC_SETTINGS="$HOME/.xbmc/userdata/addon_data/os.openelec.settings/settings.xml"
|
||||
|
||||
case $RUNLEVEL in
|
||||
boot)
|
||||
if [ -f "$OPENELEC_SETTINGS" ]; then
|
||||
progress "creating system settings"
|
||||
if [ -f "$OPENELEC_SETTINGS" ]; then
|
||||
progress "creating system settings"
|
||||
|
||||
mkdir -p /var/config
|
||||
cat "$OPENELEC_SETTINGS" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d' > /var/config/settings.conf
|
||||
fi
|
||||
;;
|
||||
|
||||
poweroff|reboot)
|
||||
;;
|
||||
esac
|
||||
mkdir -p /var/config
|
||||
cat "$OPENELEC_SETTINGS" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d' > /var/config/settings.conf
|
||||
fi
|
||||
|
||||
@ -23,30 +23,23 @@
|
||||
#
|
||||
# runlevels: openelec, textmode
|
||||
|
||||
case $RUNLEVEL in
|
||||
boot)
|
||||
if [ -d /usr/config ]; then
|
||||
progress "copy userconfig and samples"
|
||||
if [ -d /usr/config ]; then
|
||||
progress "copy userconfig and samples"
|
||||
|
||||
cd /usr/config
|
||||
mkdir -p /storage/.config
|
||||
cd /usr/config
|
||||
mkdir -p /storage/.config
|
||||
|
||||
for dir in `find . -type d`; do
|
||||
mkdir -p /storage/.config/$dir
|
||||
done
|
||||
for dir in `find . -type d`; do
|
||||
mkdir -p /storage/.config/$dir
|
||||
done
|
||||
|
||||
for config in `find . -type f -name "*.conf"`; do
|
||||
if [ ! -f /storage/.config/$config ]; then
|
||||
cp $config /storage/.config/$config
|
||||
fi
|
||||
done
|
||||
for config in `find . -type f -name "*.conf"`; do
|
||||
if [ ! -f /storage/.config/$config ]; then
|
||||
cp $config /storage/.config/$config
|
||||
fi
|
||||
done
|
||||
|
||||
for sample in `find . -type f -name "*.sample"`; do
|
||||
cp $sample /storage/.config/$sample
|
||||
done
|
||||
fi
|
||||
;;
|
||||
|
||||
poweroff|reboot)
|
||||
;;
|
||||
esac
|
||||
for sample in `find . -type f -name "*.sample"`; do
|
||||
cp $sample /storage/.config/$sample
|
||||
done
|
||||
fi
|
||||
|
||||
@ -23,22 +23,10 @@
|
||||
#
|
||||
# runlevels: openelec, installer, textmode
|
||||
|
||||
case $RUNLEVEL in
|
||||
boot)
|
||||
(
|
||||
progress "Starting Syslog daemon"
|
||||
syslogd
|
||||
(
|
||||
progress "Starting Syslog daemon"
|
||||
syslogd
|
||||
|
||||
progress "Starting Kernellog daemon"
|
||||
klogd
|
||||
)&
|
||||
;;
|
||||
|
||||
poweroff|reboot)
|
||||
progress "Stopping Kernellog daemon"
|
||||
killall klogd
|
||||
|
||||
progress "Stopping Syslog daemon"
|
||||
killall syslogd
|
||||
;;
|
||||
esac
|
||||
progress "Starting Kernellog daemon"
|
||||
klogd
|
||||
)&
|
||||
|
||||
@ -23,12 +23,5 @@
|
||||
#
|
||||
# runlevels: openelec, installer, textmode
|
||||
|
||||
case $RUNLEVEL in
|
||||
boot)
|
||||
progress "Setup some CDROM settings"
|
||||
sysctl -w dev.cdrom.lock=0 > /dev/null 2>&1 &
|
||||
;;
|
||||
|
||||
poweroff|reboot)
|
||||
;;
|
||||
esac
|
||||
progress "Setup some CDROM settings"
|
||||
sysctl -w dev.cdrom.lock=0 > /dev/null 2>&1 &
|
||||
|
||||
@ -24,19 +24,12 @@
|
||||
|
||||
TTY="1"
|
||||
|
||||
case $RUNLEVEL in
|
||||
boot)
|
||||
echo "###########################################"
|
||||
echo "## it seems we are running in Text mode. ##"
|
||||
echo "## .... starting shell on console $TTY .... ##"
|
||||
echo "## ...... switch with ctrl-alt-f$TTY ...... ##"
|
||||
echo "###########################################"
|
||||
echo "###########################################"
|
||||
echo "## it seems we are running in Text mode. ##"
|
||||
echo "## .... starting shell on console $TTY .... ##"
|
||||
echo "## ...... switch with ctrl-alt-f$TTY ...... ##"
|
||||
echo "###########################################"
|
||||
|
||||
while true; do
|
||||
openvt -w -c $TTY /bin/sh
|
||||
done
|
||||
;;
|
||||
|
||||
poweroff|reboot)
|
||||
;;
|
||||
esac
|
||||
while true; do
|
||||
openvt -w -c $TTY /bin/sh
|
||||
done
|
||||
|
||||
@ -24,14 +24,14 @@
|
||||
################################################################################
|
||||
|
||||
# getting runlevel
|
||||
MODE="openelec"
|
||||
RUNLEVEL="openelec"
|
||||
|
||||
if test "$TEXTMODE" = yes; then
|
||||
MODE="textmode"
|
||||
RUNLEVEL="textmode"
|
||||
fi
|
||||
|
||||
if test "$INSTALLER" = yes; then
|
||||
MODE="installer"
|
||||
RUNLEVEL="installer"
|
||||
fi
|
||||
|
||||
export MODE
|
||||
export RUNLEVEL
|
||||
|
||||
@ -26,6 +26,16 @@
|
||||
|
||||
echo 0 > /sys/devices/virtual/graphics/fbcon/cursor_blink
|
||||
|
||||
mount -n -t devtmpfs none /dev
|
||||
|
||||
mkdir -p /dev/pts
|
||||
mount -n -t devpts -o gid=5,mode=620 none /dev/pts
|
||||
|
||||
mkdir -p /dev/shm
|
||||
mount -n -t tmpfs none /dev/shm
|
||||
|
||||
mount -n -t tmpfs none /run
|
||||
|
||||
# showing version
|
||||
lsb_release
|
||||
|
||||
@ -36,10 +46,8 @@
|
||||
progress "Starting Init Scripts"
|
||||
RET=0
|
||||
|
||||
RUNLEVEL="boot"
|
||||
|
||||
for script in `ls -1 /etc/init.d/*`; do
|
||||
if grep -q -e "^# runlevels:.*$MODE" $script; then
|
||||
for script in /etc/init.d/*; do
|
||||
if grep -q -e "^# runlevels:.*$RUNLEVEL" $script; then
|
||||
. $script
|
||||
S_RET=$?
|
||||
test $S_RET -ge $RET && RET=$S_RET
|
||||
|
||||
@ -23,19 +23,10 @@
|
||||
#
|
||||
# runlevels: openelec, textmode
|
||||
|
||||
case $RUNLEVEL in
|
||||
boot)
|
||||
(
|
||||
progress "Starting D-BUS"
|
||||
(
|
||||
progress "Starting D-BUS"
|
||||
|
||||
mkdir -p /var/lib/dbus /var/run/dbus
|
||||
dbus-uuidgen --ensure
|
||||
dbus-daemon --system
|
||||
)&
|
||||
;;
|
||||
|
||||
poweroff|reboot)
|
||||
progress "Stopping D-BUS"
|
||||
killall dbus-daemon
|
||||
;;
|
||||
esac
|
||||
mkdir -p /var/lib/dbus /var/run/dbus
|
||||
dbus-uuidgen --ensure
|
||||
dbus-daemon --system
|
||||
)&
|
||||
@ -23,14 +23,5 @@
|
||||
#
|
||||
# runlevels: openelec, textmode
|
||||
|
||||
case $RUNLEVEL in
|
||||
boot)
|
||||
progress "Starting Fuse"
|
||||
mount -t fusectl fusectl /sys/fs/fuse/connections >/dev/null 2>&1
|
||||
;;
|
||||
|
||||
poweroff|reboot)
|
||||
progress "Stopping Fuse"
|
||||
umount /sys/fs/fuse/connections
|
||||
;;
|
||||
esac
|
||||
progress "Starting Fuse"
|
||||
mount -t fusectl fusectl /sys/fs/fuse/connections >/dev/null 2>&1
|
||||
@ -22,37 +22,28 @@
|
||||
#
|
||||
# runlevels: openelec, textmode
|
||||
|
||||
case $RUNLEVEL in
|
||||
boot)
|
||||
(
|
||||
if [ -f /var/config/settings.conf ]; then
|
||||
. /var/config/settings.conf
|
||||
(
|
||||
if [ -f /var/config/settings.conf ]; then
|
||||
. /var/config/settings.conf
|
||||
|
||||
if [ ! "$LCD_DRIVER" = none ]; then
|
||||
if [ ! "$LCD_DRIVER" = none ]; then
|
||||
|
||||
progress "Starting LCD daemon with driver: $LCD_DRIVER"
|
||||
progress "Starting LCD daemon with driver: $LCD_DRIVER"
|
||||
|
||||
if [ -f /storage/.config/LCDd.conf ]; then
|
||||
LCD_CONFIG="/storage/.config/LCDd.conf"
|
||||
else
|
||||
LCD_CONFIG="/etc/LCDd.conf"
|
||||
fi
|
||||
|
||||
# sleep 10sec. to for irserver loading
|
||||
if [ "$LCD_DRIVER" = "irtrans" ]; then
|
||||
usleep 7000000
|
||||
fi
|
||||
|
||||
# sleep another 3sec. to for irserver loading
|
||||
usleep 3000000
|
||||
LCDd -c $LCD_CONFIG -d $LCD_DRIVER -s true > /dev/null 2>&1
|
||||
fi
|
||||
if [ -f /storage/.config/LCDd.conf ]; then
|
||||
LCD_CONFIG="/storage/.config/LCDd.conf"
|
||||
else
|
||||
LCD_CONFIG="/etc/LCDd.conf"
|
||||
fi
|
||||
)&
|
||||
;;
|
||||
|
||||
poweroff|reboot)
|
||||
progress "Stopping LCD daemon"
|
||||
killall LCDd
|
||||
;;
|
||||
esac
|
||||
# sleep 10sec. to for irserver loading
|
||||
if [ "$LCD_DRIVER" = "irtrans" ]; then
|
||||
usleep 7000000
|
||||
fi
|
||||
|
||||
# sleep another 3sec. to for irserver loading
|
||||
usleep 3000000
|
||||
LCDd -c $LCD_CONFIG -d $LCD_DRIVER -s true > /dev/null 2>&1
|
||||
fi
|
||||
fi
|
||||
)&
|
||||
|
||||
@ -22,17 +22,8 @@
|
||||
#
|
||||
# runlevels: openelec, textmode
|
||||
|
||||
case $RUNLEVEL in
|
||||
boot)
|
||||
(
|
||||
progress "starting ATVclient"
|
||||
mkdir -p /storage/.cache
|
||||
atvclient -m > /dev/null 2>&1
|
||||
)&
|
||||
;;
|
||||
|
||||
poweroff|reboot)
|
||||
progress "stopping ATVclient"
|
||||
killall atvclient
|
||||
;;
|
||||
esac
|
||||
(
|
||||
progress "starting ATVclient"
|
||||
mkdir -p /storage/.cache
|
||||
atvclient -m > /dev/null 2>&1
|
||||
)&
|
||||
@ -22,17 +22,8 @@
|
||||
#
|
||||
# runlevels: openelec, textmode
|
||||
|
||||
case $RUNLEVEL in
|
||||
boot)
|
||||
(
|
||||
progress "starting eventlircd"
|
||||
mkdir -p /var/run/lirc
|
||||
eventlircd --evmap=/etc/eventlircd.d --socket=/var/run/lirc/lircd --release=_UP
|
||||
)&
|
||||
;;
|
||||
|
||||
poweroff|reboot)
|
||||
progress "starting eventlircd"
|
||||
killall eventlircd
|
||||
;;
|
||||
esac
|
||||
(
|
||||
progress "starting eventlircd"
|
||||
mkdir -p /var/run/lirc
|
||||
eventlircd --evmap=/etc/eventlircd.d --socket=/var/run/lirc/lircd --release=_UP
|
||||
)&
|
||||
@ -25,25 +25,16 @@
|
||||
[ -f /storage/.config/remote.conf ] && . /storage/.config/remote.conf
|
||||
[ -f /storage/.config/lcd.conf ] && . /storage/.config/lcd.conf
|
||||
|
||||
case $RUNLEVEL in
|
||||
boot)
|
||||
if [ "$REMOTE_BACKEND" = "irtrans" -o "$LCD_DRIVER" = "irtrans" ]; then
|
||||
if [ "$REMOTE_BACKEND" = "irtrans" -o "$LCD_DRIVER" = "irtrans" ]; then
|
||||
|
||||
progress "Starting IRtrans daemon"
|
||||
progress "Starting IRtrans daemon"
|
||||
|
||||
mkdir -p /var/run/lirc
|
||||
mkdir -p /var/run/lirc
|
||||
|
||||
[ "$DEBUG" = "yes" ] && \
|
||||
IRSERVER_ARG="$IRSERVER_ARG -loglevel 4" # set loglevel in debugmode
|
||||
[ "$DEBUG" = "yes" ] && \
|
||||
IRSERVER_ARG="$IRSERVER_ARG -loglevel 4" # set loglevel in debugmode
|
||||
|
||||
irserver -logfile /var/log/irserver.log -pidfile /var/run/irserver.pid \
|
||||
$IRSERVER_ARG -daemon /dev/irtrans0 > /dev/null 2>&1
|
||||
irserver -logfile /var/log/irserver.log -pidfile /var/run/irserver.pid \
|
||||
$IRSERVER_ARG -daemon /dev/irtrans0 > /dev/null 2>&1
|
||||
|
||||
fi
|
||||
;;
|
||||
|
||||
poweroff|reboot)
|
||||
progress "Stopping IRtrans daemon"
|
||||
killall irserver
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
@ -23,16 +23,7 @@
|
||||
#
|
||||
# runlevels: openelec, installer, textmode
|
||||
|
||||
case $RUNLEVEL in
|
||||
boot)
|
||||
progress "starting udev daemon"
|
||||
echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug
|
||||
mkdir -p /dev/rules.d
|
||||
udevd --daemon
|
||||
;;
|
||||
|
||||
poweroff|reboot)
|
||||
progress "stopping udev daemon"
|
||||
killall udevd
|
||||
;;
|
||||
esac
|
||||
progress "starting udev daemon"
|
||||
echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug
|
||||
mkdir -p /dev/rules.d
|
||||
udevd --daemon
|
||||
|
||||
@ -23,14 +23,7 @@
|
||||
#
|
||||
# runlevels: openelec, installer, textmode
|
||||
|
||||
case $RUNLEVEL in
|
||||
boot)
|
||||
progress "monitoring udev events"
|
||||
udevadm monitor -e > /dev/udev.log &
|
||||
;;
|
||||
|
||||
poweroff|reboot)
|
||||
progress "Stopping udev monitor"
|
||||
killall udevadm
|
||||
;;
|
||||
esac
|
||||
(
|
||||
progress "monitoring udev events"
|
||||
udevadm monitor -e > /dev/udev.log
|
||||
)&
|
||||
|
||||
@ -23,15 +23,8 @@
|
||||
#
|
||||
# runlevels: openelec, installer, textmode
|
||||
|
||||
case $RUNLEVEL in
|
||||
boot)
|
||||
(
|
||||
progress "request udev events from the kernel"
|
||||
udevadm trigger --action=add
|
||||
udevadm settle
|
||||
)&
|
||||
;;
|
||||
|
||||
poweroff|reboot)
|
||||
;;
|
||||
esac
|
||||
(
|
||||
progress "request udev events from the kernel"
|
||||
udevadm trigger --action=add
|
||||
udevadm settle
|
||||
)&
|
||||
|
||||
@ -23,36 +23,29 @@
|
||||
#
|
||||
# runlevels: openelec, textmode
|
||||
|
||||
case $RUNLEVEL in
|
||||
boot)
|
||||
(
|
||||
INSTALLED_MEMORY=`cat /proc/meminfo | grep 'MemTotal:' | awk '{print $2}'`
|
||||
SWAP=`blkid -t TYPE="swap" -o device`
|
||||
SWAPFILE="$HOME/.cache/swapfile"
|
||||
(
|
||||
INSTALLED_MEMORY=`cat /proc/meminfo | grep 'MemTotal:' | awk '{print $2}'`
|
||||
SWAP=`blkid -t TYPE="swap" -o device`
|
||||
SWAPFILE="$HOME/.cache/swapfile"
|
||||
|
||||
if [ "$INSTALLED_MEMORY" -le "500000" ]; then
|
||||
if [ -z "$SWAP" -a ! -f "$SWAPFILE" ]; then
|
||||
progress "creating swapfile"
|
||||
mkdir -p $HOME/.cache
|
||||
dd if=/dev/zero of=$SWAPFILE bs=1024 count=262144 2>&1 > /dev/null
|
||||
mkswap $SWAPFILE 2>&1 > /dev/null
|
||||
fi
|
||||
if [ "$INSTALLED_MEMORY" -le "500000" ]; then
|
||||
if [ -z "$SWAP" -a ! -f "$SWAPFILE" ]; then
|
||||
progress "creating swapfile"
|
||||
mkdir -p $HOME/.cache
|
||||
dd if=/dev/zero of=$SWAPFILE bs=1024 count=262144 2>&1 > /dev/null
|
||||
mkswap $SWAPFILE 2>&1 > /dev/null
|
||||
fi
|
||||
|
||||
progress "enable swap"
|
||||
[ -z "$SWAP" -a -f "$SWAPFILE" ] && SWAP=$SWAPFILE
|
||||
for i in $SWAP; do
|
||||
swapon -p 10000 $SWAP 2>&1 > /dev/null
|
||||
done
|
||||
progress "enable swap"
|
||||
[ -z "$SWAP" -a -f "$SWAPFILE" ] && SWAP=$SWAPFILE
|
||||
for i in $SWAP; do
|
||||
swapon -p 10000 $SWAP 2>&1 > /dev/null
|
||||
done
|
||||
|
||||
if [ "$INSTALLED_MEMORY" -le "260000" ]; then
|
||||
sysctl -w vm.swappiness=100 2>&1 > /dev/null
|
||||
else
|
||||
sysctl -w vm.swappiness=60 2>&1 > /dev/null
|
||||
fi
|
||||
fi
|
||||
)&
|
||||
;;
|
||||
|
||||
poweroff|reboot)
|
||||
;;
|
||||
esac
|
||||
if [ "$INSTALLED_MEMORY" -le "260000" ]; then
|
||||
sysctl -w vm.swappiness=100 2>&1 > /dev/null
|
||||
else
|
||||
sysctl -w vm.swappiness=60 2>&1 > /dev/null
|
||||
fi
|
||||
fi
|
||||
)&
|
||||
@ -22,31 +22,24 @@
|
||||
#
|
||||
# runlevels: openelec
|
||||
|
||||
case $RUNLEVEL in
|
||||
boot)
|
||||
(
|
||||
if [ -f /var/config/settings.conf ]; then
|
||||
. /var/config/settings.conf
|
||||
(
|
||||
if [ -f /var/config/settings.conf ]; then
|
||||
. /var/config/settings.conf
|
||||
|
||||
progress "setup keyboard layout"
|
||||
progress "setup keyboard layout"
|
||||
|
||||
if [ -z $X11_KEYMAP ]; then
|
||||
X11_KEYMAP="us"
|
||||
fi
|
||||
if [ -z $X11_KEYMAP ]; then
|
||||
X11_KEYMAP="us"
|
||||
fi
|
||||
|
||||
# waiting for Xorg to start
|
||||
wait_for_xorg
|
||||
# waiting for Xorg to start
|
||||
wait_for_xorg
|
||||
|
||||
# setup keymap
|
||||
if [ -z $X11_KEYMAP2 ]; then
|
||||
setxkbmap -display $DISPLAY $X11_KEYMAP;
|
||||
else
|
||||
setxkbmap -display $DISPLAY -layout "$X11_KEYMAP,$X11_KEYMAP2" -option "grp:alt_shift_toggle";
|
||||
fi
|
||||
# setup keymap
|
||||
if [ -z $X11_KEYMAP2 ]; then
|
||||
setxkbmap -display $DISPLAY $X11_KEYMAP;
|
||||
else
|
||||
setxkbmap -display $DISPLAY -layout "$X11_KEYMAP,$X11_KEYMAP2" -option "grp:alt_shift_toggle";
|
||||
fi
|
||||
)&
|
||||
;;
|
||||
|
||||
poweroff|reboot)
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
)&
|
||||
|
||||
@ -22,19 +22,12 @@
|
||||
#
|
||||
# runlevels: openelec
|
||||
|
||||
case $RUNLEVEL in
|
||||
boot)
|
||||
(
|
||||
progress "starting Windowmanager"
|
||||
(
|
||||
progress "starting Windowmanager"
|
||||
|
||||
# waiting for Xorg to start
|
||||
wait_for_xorg
|
||||
# waiting for Xorg to start
|
||||
wait_for_xorg
|
||||
|
||||
# starting ratpoison
|
||||
DISPLAY=:0.0 ratpoison > /dev/null 2>&1
|
||||
)&
|
||||
;;
|
||||
|
||||
poweroff|reboot)
|
||||
;;
|
||||
esac
|
||||
# starting ratpoison
|
||||
DISPLAY=:0.0 ratpoison > /dev/null 2>&1
|
||||
)&
|
||||
|
||||
@ -1,34 +0,0 @@
|
||||
################################################################################
|
||||
# This file is part of OpenELEC - http://www.openelec.tv
|
||||
# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
|
||||
#
|
||||
# This Program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 2, or (at your option)
|
||||
# any later version.
|
||||
#
|
||||
# This Program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with OpenELEC.tv; see the file COPYING. If not, write to
|
||||
# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
# http://www.gnu.org/copyleft/gpl.html
|
||||
################################################################################
|
||||
|
||||
#
|
||||
# mounting needed filesystems
|
||||
#
|
||||
# runlevels: openelec, installer, textmode
|
||||
|
||||
case $RUNLEVEL in
|
||||
boot)
|
||||
# dont do anything here, we start xorg per udev
|
||||
;;
|
||||
poweroff|reboot)
|
||||
progress "stopping Xorg"
|
||||
killall Xorg
|
||||
;;
|
||||
esac
|
||||
@ -22,7 +22,7 @@
|
||||
|
||||
. /etc/profile
|
||||
|
||||
if [ "$MODE" = openelec ]; then
|
||||
if [ "$RUNLEVEL" = openelec ]; then
|
||||
|
||||
logger -t Xorg "### starting Xorg with driver ${xorg_driver} ###"
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user