committing changes in /etc after apt run

Package changes:
-alacarte 3.11.91-2+rpi2
+alacarte 3.11.91-2+rpi4
-bluez-firmware 1.2-3+rpi1
+bluez-firmware 1.2-3+rpi2
-e2fslibs 1.42.12-2
-e2fsprogs 1.42.12-2
+e2fslibs 1.43.3-1~bpo8+1
+e2fsprogs 1.43.3-1~bpo8+1
-firmware-atheros 0.43+rpi5
-firmware-brcm80211 0.43+rpi5
-firmware-libertas 0.43+rpi5
-firmware-ralink 0.43+rpi5
-firmware-realtek 0.43+rpi5
+firmware-atheros 1:0.43+rpi6
+firmware-brcm80211 1:0.43+rpi6
+firmware-libertas 1:0.43+rpi6
+firmware-ralink 1:0.43+rpi6
+firmware-realtek 1:0.43+rpi6
-gpicview 0.2.4-2
+gpicview 0.2.4-2+rpi1
-libasound2 1.0.28-1+rpi1
-libasound2-data 1.0.28-1+rpi1
+libasound2 1.0.28-1+rpi3
+libasound2-data 1.0.28-1+rpi3
-libblas-common 1.2.20110419-10
-libblas3 1.2.20110419-10
+libblas-common 3.7.0-1~bpo8+1
+libblas3 3.7.0-1~bpo8+1
-libbluray1 1:0.6.2-1
+libbluray1 1:0.9.3-3
-libcairo-gobject2 1.14.0-2.1+deb8u1+rpi1
-libcairo2 1.14.0-2.1+deb8u1+rpi1
+libcairo-gobject2 1.14.0-2.1+deb8u2+rpi1
+libcairo2 1.14.0-2.1+deb8u2+rpi1
-libcomerr2 1.42.12-2
+libcomerr2 1.43.3-1~bpo8+1
-libcupsfilters1 1.0.61-5+deb8u3
+libcupsfilters1 1.0.61-5+deb8u3+rpi1
-libdrm-amdgpu1 2.4.65-3~bpo8+1
-libdrm-freedreno1 2.4.65-3~bpo8+1
-libdrm-nouveau2 2.4.65-3~bpo8+1
-libdrm-radeon1 2.4.65-3~bpo8+1
-libdrm2 2.4.65-3~bpo8+1
+libdrm-amdgpu1 2.4.71-1+rpi1
+libdrm-freedreno1 2.4.71-1+rpi1
+libdrm-nouveau2 2.4.71-1+rpi1
+libdrm-radeon1 2.4.71-1+rpi1
+libdrm2 2.4.71-1+rpi1
-libegl1-mesa 11.1.0-1+rpi1
+libegl1-mesa 13.0.0-1+rpi1
-libfm-data 1.2.3-1+rpi1
-libfm-extra4 1.2.3-1+rpi1
-libfm-gtk-data 1.2.3-1+rpi1
-libfm-gtk4 1.2.3-1+rpi1
-libfm-modules 1.2.3-1+rpi1
-libfm4 1.2.3-1+rpi1
+libfm-data 1.2.3-1+rpi2
+libfm-extra4 1.2.3-1+rpi2
+libfm-gtk-data 1.2.3-1+rpi2
+libfm-gtk4 1.2.3-1+rpi2
+libfm-modules 1.2.3-1+rpi2
+libfm4 1.2.3-1+rpi2
-libgbm1 11.1.0-1+rpi1
+libgbm1 13.0.0-1+rpi1
-libgl1-mesa-glx 11.1.0-1+rpi1
-libglapi-mesa 11.1.0-1+rpi1
-libgles1-mesa 11.1.0-1+rpi1
-libgles2-mesa 11.1.0-1+rpi1
+libgl1-mesa-glx 13.0.0-1+rpi1
+libglapi-mesa 13.0.0-1+rpi1
+libgles1-mesa 13.0.0-1+rpi1
+libgles2-mesa 13.0.0-1+rpi1
-liblapack3 3.5.0-4
+liblapack3 3.7.0-1~bpo8+1
-libobrender29 3.5.2-8+rpi2
-libobt2 3.5.2-8+rpi2
+libobrender29 3.5.2-8+rpi3
+libobt2 3.5.2-8+rpi3
-libpam-modules 1.1.8-3.1+deb8u1
-libpam-modules-bin 1.1.8-3.1+deb8u1
-libpam-runtime 1.1.8-3.1+deb8u1
+libpam-modules 1.1.8-3.1+deb8u2+rpi3
+libpam-modules-bin 1.1.8-3.1+deb8u2+rpi3
+libpam-runtime 1.1.8-3.1+deb8u2+rpi3
-libpam0g 1.1.8-3.1+deb8u1
+libpam0g 1.1.8-3.1+deb8u2+rpi3
-libraspberrypi-bin 1.20161116-1
-libraspberrypi-dev 1.20161116-1
-libraspberrypi-doc 1.20161116-1
-libraspberrypi0 1.20161116-1
+libraspberrypi-bin 1.20170703-1
+libraspberrypi-dev 1.20170703-1
+libraspberrypi-doc 1.20170703-1
+libraspberrypi0 1.20170703-1
-libss2 1.42.12-2
+libss2 1.43.3-1~bpo8+1
-libva1 1.4.1-1
+libva1 1.7.3-2
-libwayland-client0 1.6.0-2
-libwayland-cursor0 1.6.0-2
-libwayland-server0 1.6.0-2
+libwayland-client0 1.11.0-2
+libwayland-cursor0 1.11.0-2
+libwayland-server0 1.11.0-2
-libxfont1 1:1.5.1-1
+libxfont1 1:1.5.2-1
-lxpanel 0.7.2-1+rpi16
-lxpanel-data 0.7.2-1+rpi16
+lxpanel 0.7.2-1+rpi20
+lxpanel-data 0.7.2-1+rpi20
-man-db 2.7.0.2-5
+man-db 2.7.5-1~bpo8+1
-nodered 0.15.2
+nodered 0.15.3-1
-nuscratch 20161021
+nuscratch 20170112
-openbox 3.5.2-8+rpi2
+openbox 3.5.2-8+rpi3
-pcmanfm 1.2.3-1.1+rpi5
+pcmanfm 1.2.3-1.1+rpi7
-pi-bluetooth 0.1.1
-pi-greeter 0.3
+pi-bluetooth 0.1.3+1
+pi-greeter 0.5
-piclone 0.3
-pigpio 1.30-1
+piclone 0.4
+pigpio 1.60-1
-pipanel 20161017~131745
-pishutdown 0.7
+pipanel 20170508~082712
+pishutdown 0.8
-python-gpiozero 1.3.1
+python-gpiozero 1.4.0
-python-picamera 1.12
-python-picraft 0.6-1
+python-picamera 1.13
+python-picraft 1.0
-python-pigpio 1.30-1
+python-pigpio 1.60-1
-python3-gpiozero 1.3.1
+python3-gpiozero 1.4.0
-python3-picamera 1.12
-python3-picraft 0.6-1
+python3-picamera 1.13
+python3-picraft 1.0
-python3-pigpio 1.30-1
+python3-pigpio 1.60-1
-raspberrypi-bootloader 1.20161116-1
-raspberrypi-kernel 1.20161116-1
+raspberrypi-bootloader 1.20170703-1
+raspberrypi-kernel 1.20170703-1
-raspberrypi-sys-mods 20161018+3
+raspberrypi-sys-mods 20170519
-raspi-config 20161114
+raspi-config 20170705
-raspi-gpio 0.20150914
-rc-gui 1.4
+raspi-gpio 0.20170105
+rc-gui 1.9
-realvnc-vnc-server 5.3.2.22607
-realvnc-vnc-viewer 5.3.2.21015
+realvnc-vnc-server 6.1.1.28093
+realvnc-vnc-viewer 6.1.1.28093
-va-driver-all 1.4.1-1
+va-driver-all 1.7.3-2
-wiringpi 2.32
+wiringpi 2.44
-x11-common 1:7.7+7
+x11-common 1:7.7+16
-xserver-common 2:1.17.2-1+rpi1
-xserver-xorg 1:7.7+7+b1
-xserver-xorg-core 2:1.17.2-1+rpi1
+xserver-common 2:1.18.4-2+rpi1
+xserver-xorg 1:7.7+16
+xserver-xorg-core 2:1.18.4-2+rpi1
-xserver-xorg-input-evdev 1:2.9.2-1~bpo8+1
-xserver-xorg-input-synaptics 1.8.2-1~bpo8+1
-xserver-xorg-video-fbdev 1:0.4.4-1+rpi1
-xserver-xorg-video-fbturbo 1.20150305~205709
+xserver-xorg-input-evdev 1:2.10.3-1
+xserver-xorg-input-synaptics 1.8.3-2
+xserver-xorg-video-fbdev 1:0.4.4-1+rpi2
+xserver-xorg-video-fbturbo 1.20161111~122359

diff --git a/.etckeeper b/.etckeeper
index 2b14b3abe3a0b94dd060085202c23817aed25f1d..32cc1d882c4b7d7fd206c0acdf4a66eafda726b2 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -46,6 +46,7 @@ mkdir -p './triggerhappy/triggers.d'
 mkdir -p './udev/hwdb.d'
 mkdir -p './udisks2'
 mkdir -p './usb_modeswitch.d'
+mkdir -p './vnc/licensekeys/vncserver'
 maybe chmod 0755 '.'
 maybe chmod 0700 '.etckeeper'
 maybe chmod 0644 '.fstab'
@@ -332,6 +333,7 @@ maybe chmod 0644 'default/networking'
 maybe chmod 0644 'default/nfs-common'
 maybe chmod 0644 'default/nss'
 maybe chmod 0644 'default/ntp'
+maybe chmod 0644 'default/raspberrypi-kernel'
 maybe chmod 0644 'default/rcS'
 maybe chmod 0644 'default/rsync'
 maybe chmod 0644 'default/rsyslog'
@@ -643,8 +645,6 @@ maybe chmod 0755 'init.d/umountfs'
 maybe chmod 0755 'init.d/umountnfs.sh'
 maybe chmod 0755 'init.d/umountroot'
 maybe chmod 0755 'init.d/urandom'
-maybe chmod 0755 'init.d/vncserver-virtuald'
-maybe chmod 0755 'init.d/vncserver-x11-serviced'
 maybe chmod 0755 'init.d/x11-common'
 maybe chmod 0644 'init/binfmt-support.conf'
 maybe chmod 0644 'init/bootmisc.sh.conf'
@@ -894,6 +894,8 @@ maybe chmod 0755 'menu-methods/xdg-desktop-entry-spec-sessions'
 maybe chmod 0644 'mime.types'
 maybe chmod 0644 'mke2fs.conf'
 maybe chmod 0755 'modprobe.d'
+maybe chmod 0644 'modprobe.d/blacklist-rtl8192cu.conf'
+maybe chmod 0644 'modprobe.d/blacklist-rtl8xxxu.conf'
 maybe chmod 0644 'modprobe.d/fbdev-blacklist.conf'
 maybe chmod 0644 'modprobe.d/ipv6.conf'
 maybe chmod 0644 'modprobe.d/libpisock9.conf'
@@ -1177,7 +1179,6 @@ maybe chmod 0755 'vnc/config.d'
 maybe chmod 0644 'vnc/config.d/common'
 maybe chmod 0755 'vnc/licensekeys'
 maybe chmod 0755 'vnc/licensekeys/vncserver'
-maybe chmod 0644 'vnc/licensekeys/vncserver/f5915f84-ba51-49ef-8a3b-c92db490e8d1-7cdd908b2399'
 maybe chmod 0644 'vnc/updateid'
 maybe chmod 0644 'vnc/vncelevatecfg'
 maybe chmod 0755 'vnc/xstartup'

diff --git a/alternatives/libblas.so.3gf b/alternatives/libblas.so.3gf
deleted file mode 120000 (symlink)
index 47d84db..0000000
--- a/alternatives/libblas.so.3gf
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/libblas/libblas.so.3
\ No newline at end of file

diff --git a/alternatives/liblapack.so.3gf b/alternatives/liblapack.so.3gf
deleted file mode 120000 (symlink)
index c45d4a2..0000000
--- a/alternatives/liblapack.so.3gf
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/lapack/liblapack.so.3
\ No newline at end of file

diff --git a/apt/apt.conf.d/01autoremove-kernels b/apt/apt.conf.d/01autoremove-kernels
index b69164fdc8fa68f09904ef4fc61812a191df37fe..fe818ad62222d09b28275bd84a0b2fb5f26357c2 100644 (file)
--- a/apt/apt.conf.d/01autoremove-kernels
+++ b/apt/apt.conf.d/01autoremove-kernels
@@ -1,26 +1,26 @@
 // DO NOT EDIT! File autogenerated by /etc/kernel/postinst.d/apt-auto-removal
 APT::NeverAutoRemove
 {
-   "^linux-image-4\.4\.32-v7+$";
-   "^linux-image-4\.4\.33+$";
-   "^linux-headers-4\.4\.32-v7+$";
-   "^linux-headers-4\.4\.33+$";
-   "^linux-image-extra-4\.4\.32-v7+$";
-   "^linux-image-extra-4\.4\.33+$";
-   "^linux-signed-image-4\.4\.32-v7+$";
-   "^linux-signed-image-4\.4\.33+$";
-   "^kfreebsd-image-4\.4\.32-v7+$";
-   "^kfreebsd-image-4\.4\.33+$";
-   "^kfreebsd-headers-4\.4\.32-v7+$";
-   "^kfreebsd-headers-4\.4\.33+$";
-   "^gnumach-image-4\.4\.32-v7+$";
-   "^gnumach-image-4\.4\.33+$";
-   "^.*-modules-4\.4\.32-v7+$";
-   "^.*-modules-4\.4\.33+$";
-   "^.*-kernel-4\.4\.32-v7+$";
-   "^.*-kernel-4\.4\.33+$";
-   "^linux-backports-modules-.*-4\.4\.32-v7+$";
-   "^linux-backports-modules-.*-4\.4\.33+$";
-   "^linux-tools-4\.4\.32-v7+$";
-   "^linux-tools-4\.4\.33+$";
+   "^linux-image-4\.14\.85+$";
+   "^linux-image-4\.9\.35-v7+$";
+   "^linux-headers-4\.14\.85+$";
+   "^linux-headers-4\.9\.35-v7+$";
+   "^linux-image-extra-4\.14\.85+$";
+   "^linux-image-extra-4\.9\.35-v7+$";
+   "^linux-signed-image-4\.14\.85+$";
+   "^linux-signed-image-4\.9\.35-v7+$";
+   "^kfreebsd-image-4\.14\.85+$";
+   "^kfreebsd-image-4\.9\.35-v7+$";
+   "^kfreebsd-headers-4\.14\.85+$";
+   "^kfreebsd-headers-4\.9\.35-v7+$";
+   "^gnumach-image-4\.14\.85+$";
+   "^gnumach-image-4\.9\.35-v7+$";
+   "^.*-modules-4\.14\.85+$";
+   "^.*-modules-4\.9\.35-v7+$";
+   "^.*-kernel-4\.14\.85+$";
+   "^.*-kernel-4\.9\.35-v7+$";
+   "^linux-backports-modules-.*-4\.14\.85+$";
+   "^linux-backports-modules-.*-4\.9\.35-v7+$";
+   "^linux-tools-4\.14\.85+$";
+   "^linux-tools-4\.9\.35-v7+$";
 };

diff --git a/default/raspberrypi-kernel b/default/raspberrypi-kernel
new file mode 100644 (file)
index 0000000..3661082
--- /dev/null
+++ b/default/raspberrypi-kernel
@@ -0,0 +1,11 @@
+# Defaults for raspberrypi-kernel
+
+# Uncomment the following line to enable generation of
+# /boot/initrd.img-KVER files (requires initramfs-tools)
+
+#INITRD=Yes
+
+# Uncomment the following line to enable generation of
+# /boot/initrd(7).img files (requires rpi-initramfs-tools)
+
+#RPI_INITRD=Yes

diff --git a/gconf/gconf.xml.defaults/%gconf-tree.xml b/gconf/gconf.xml.defaults/%gconf-tree.xml
index e6b81e136b54b33600b21297b4db299759071fdf..c8e7441ef2d39dc7b15b9e7d9ba630fcd09a91a9 100644 (file)
--- a/gconf/gconf.xml.defaults/%gconf-tree.xml
+++ b/gconf/gconf.xml.defaults/%gconf-tree.xml
@@ -5,19 +5,19 @@
                        <dir name="gnome">
                                <dir name="url-handlers">
                                        <dir name="vnclicenseserver">
-                                               <entry name="need-terminal" mtime="1479588717" type="schema" stype="bool" owner="vnclicenseserver">
+                                               <entry name="need-terminal" mtime="1675869677" type="schema" stype="bool" owner="vnclicenseserver">
                                                        <local_schema locale="C">
                                                                <default type="bool" value="false"/>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="command" mtime="1479588717" type="schema" stype="string" owner="vnclicenseserver">
+                                               <entry name="command" mtime="1675869677" type="schema" stype="string" owner="vnclicenseserver">
                                                        <local_schema locale="C">
                                                                <default type="string">
                                                                        <stringvalue>/usr/local/bin/vnclicensewiz %s</stringvalue>
                                                                </default>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enabled" mtime="1479588717" type="schema" stype="bool" owner="vnclicenseserver">
+                                               <entry name="enabled" mtime="1675869677" type="schema" stype="bool" owner="vnclicenseserver">
                                                        <local_schema locale="C" short_desc="Set to true to enable handling of vnclicenseserver:// URLs">
                                                                <default type="bool" value="true"/>
                                                        </local_schema>
@@ -31,9 +31,9 @@
                <dir name="gnome">
                        <dir name="url-handlers">
                                <dir name="vnclicenseserver">
-                                       <entry name="need-terminal" mtime="1479588717" schema="/schemas/desktop/gnome/url-handlers/vnclicenseserver/need-terminal"/>
-                                       <entry name="command" mtime="1479588717" schema="/schemas/desktop/gnome/url-handlers/vnclicenseserver/command"/>
-                                       <entry name="enabled" mtime="1479588717" schema="/schemas/desktop/gnome/url-handlers/vnclicenseserver/enabled"/>
+                                       <entry name="need-terminal" mtime="1675869677" schema="/schemas/desktop/gnome/url-handlers/vnclicenseserver/need-terminal"/>
+                                       <entry name="command" mtime="1675869677" schema="/schemas/desktop/gnome/url-handlers/vnclicenseserver/command"/>
+                                       <entry name="enabled" mtime="1675869677" schema="/schemas/desktop/gnome/url-handlers/vnclicenseserver/enabled"/>
                                </dir>
                        </dir>
                </dir>

diff --git a/init.d/raspi-config b/init.d/raspi-config
index 8caecb0d25d4cfb0131410c24b6e0250a391649e..886273b10d31703b54dfa20a74ebe4d5a557ab0b 100755 (executable)
--- a/init.d/raspi-config
+++ b/init.d/raspi-config
@@ -3,7 +3,7 @@
 # Provides:          raspi-config
 # Required-Start: udev mountkernfs $remote_fs
 # Required-Stop:
-# Default-Start: S
+# Default-Start: S 2 3 4 5
 # Default-Stop:
 # Short-Description: Switch to ondemand cpu governor (unless shift key is pressed)
 # Description:

diff --git a/init.d/vncserver-virtuald b/init.d/vncserver-virtuald
deleted file mode 100755 (executable)
index 0bfabf0..0000000
--- a/init.d/vncserver-virtuald
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/bin/sh
-
-# chkconfig: 2345 20 80
-# description: VNC Server in Virtual Mode daemon
-# pidfile: /var/run/vncserver-virtuald.pid
-
-### BEGIN INIT INFO
-# Provides:          vncserver-virtuald
-# Required-Start:    $remote_fs $syslog $network
-# Required-Stop:     $remote_fs $syslog $network
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: VNC Server in Virtual Mode daemon
-# Description:       VNC Server in Virtual Mode daemon
-### END INIT INFO
-
-PIDFILE=/var/run/vncserver-virtuald.pid
-PATH=/bin:/usr/bin
-export PATH
-[ -r /etc/default/locale ] && . /etc/default/locale 2>/dev/null
-export LANG
-
-
-case $1 in
-start)
-    vnclicense -check > /dev/null ||
-        echo 'vncserver-virtuald: No suitable license found. You must apply 
-                    an Enterprise license to enable connections.' >&2
-    vncserver-virtuald
-    ;;
-stop)
-    if [ -r "$PIDFILE" ] && ps -p `cat "$PIDFILE"` >/dev/null; then
-      kill -TERM `cat $PIDFILE`
-    else
-      echo "No vncserver-virtuald process found to stop"
-      exit 7
-    fi
-    ;;
-force-reload|reload)
-    if [ -r "$PIDFILE" ] && ps -p `cat "$PIDFILE"` >/dev/null; then
-      kill -HUP `cat $PIDFILE`
-    else
-      echo "No vncserver-virtuald process found to reload"
-      exit 7
-    fi
-    ;;
-restart)
-    $0 stop >/dev/null || true
-    i=0
-    while [ -r "$PIDFILE" ] && [ $i -lt 5 ]; do
-      i=`expr $i + 1`
-      sleep 1
-    done
-    $0 start
-    ;;
-try-restart)
-    if $0 status >/dev/null; then
-      $0 restart
-    else
-      echo "No running vncserver-virtuald process; service not started"
-    fi
-    ;;
-status)
-    if [ '!' -f "$PIDFILE" ]; then
-        echo "vncserver-virtuald is not running"
-        exit 3
-    elif [ '!' -r "$PIDFILE" ]; then
-        echo "Status of vncserver-virtuald unknown (pidfile not readable)"
-        exit 4
-    elif ps -p `cat "$PIDFILE" 2>/dev/null` >/dev/null ; then
-        echo "vncserver-virtuald is running"
-        exit 0
-    else
-        echo "vncserver-virtuald not running but pidfile exists"
-        exit 1
-    fi
-    ;;
-*)
-    echo "Usage: $0 (start|stop|restart|status)"
-    exit 1
-    ;;
-esac
-

diff --git a/init.d/vncserver-x11-serviced b/init.d/vncserver-x11-serviced
deleted file mode 100755 (executable)
index c408c72..0000000
--- a/init.d/vncserver-x11-serviced
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/bin/sh
-
-# chkconfig: 2345 20 80
-# description: VNC Server in Service Mode daemon
-# pidfile: /var/run/vncserver-x11-serviced.pid
-
-### BEGIN INIT INFO
-# Provides:          vncserver-x11-serviced
-# Required-Start:    $remote_fs $syslog $network
-# Required-Stop:     $remote_fs $syslog $network
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: VNC Server in Service Mode daemon
-# Description:       VNC Server in Service Mode daemon
-### END INIT INFO
-
-PIDFILE=/var/run/vncserver-x11-serviced.pid
-PATH=/bin:/usr/bin
-export PATH
-[ -r /etc/default/locale ] && . /etc/default/locale 2>/dev/null
-export LANG
-
-# This is required on some systems for X authentication to work
-XAUTHLOCALHOSTNAME=localhost
-export XAUTHLOCALHOSTNAME
-
-case $1 in
-start)
-    vnclicense -check > /dev/null ||
-        echo 'vncserver-x11-serviced: No VNC licenses are installed. To enable connections,
-    apply a license with vnclicense.  If you apply a Free license and have not
-    yet specified a VNC password, please also run as root
-    `vncpasswd /root/.vnc/config.d/vncserver-x11'\'. >&2
-    vncserver-x11-serviced
-    ;;
-stop)
-    if [ -r "$PIDFILE" ] && ps -p `cat "$PIDFILE"` >/dev/null; then
-      kill -TERM `cat $PIDFILE`
-    else
-      echo "No vncserver-x11-serviced process found to stop"
-      exit 7
-    fi
-    ;;
-force-reload|reload)
-    if [ -r "$PIDFILE" ] && ps -p `cat "$PIDFILE"` >/dev/null; then
-      kill -HUP `cat $PIDFILE`
-    else
-      echo "No vncserver-x11-serviced process found to reload"
-      exit 7
-    fi
-    ;;
-restart)
-    $0 stop >/dev/null || true
-    i=0
-    while [ -r "$PIDFILE" ] && [ $i -lt 5 ]; do
-      i=`expr $i + 1`
-      sleep 1
-    done
-    $0 start
-    ;;
-try-restart)
-    if $0 status >/dev/null; then
-      $0 restart
-    else
-      echo "No running vncserver-x11-serviced process; service not started"
-    fi
-    ;;
-status)
-    if [ '!' -f "$PIDFILE" ]; then
-        echo "vncserver-x11-serviced is not running"
-        exit 3
-    elif [ '!' -r "$PIDFILE" ]; then
-        echo "Status of vncserver-x11-serviced unknown (pidfile not readable)"
-        exit 4
-    elif ps -p `cat "$PIDFILE" 2>/dev/null` >/dev/null ; then
-        echo "vncserver-x11-serviced is running"
-        exit 0
-    else
-        echo "vncserver-x11-serviced not running but pidfile exists"
-        exit 1
-    fi
-    ;;
-*)
-    echo "Usage: $0 (start|stop|restart|status)"
-    exit 1
-    ;;
-esac
-

diff --git a/init.d/x11-common b/init.d/x11-common
index 014594b7095dbc93b8022e65b0d126740011757f..63c3c307043bd94f2c7c3338affd219f3fcc2986 100755 (executable)
--- a/init.d/x11-common
+++ b/init.d/x11-common
@@ -6,6 +6,7 @@
 # Required-Stop:     $remote_fs
 # Default-Start:     S
 # Default-Stop:
+# Short-Description: set up the X server and ICE socket directories
 ### END INIT INFO
 
 set -e
@@ -74,6 +75,7 @@ set_up_dir () {
         ;;
     esac
   done
+  do_restorecon "$DIR"
 
   return 0
 }

diff --git a/lightdm/pi-greeter.conf b/lightdm/pi-greeter.conf
index b4fad31a1dbc3e5617296e28c11ed3ed8eaeb734..054a1fa419f39017ea0d8a9907998a69318d6ccb 100644 (file)
--- a/lightdm/pi-greeter.conf
+++ b/lightdm/pi-greeter.conf
@@ -1,7 +1,7 @@
 [greeter]
 default-user-image=/usr/share/raspberrypi-artwork/raspberry-pi-logo.png
 desktop_bg=#d6d6d3d3dede
-wallpaper=/usr/share/pixel-wallpaper/road.jpg
+wallpaper=/usr/share/rpd-wallpaper/road.jpg
 wallpaper_mode=crop
 gtk-theme-name=PiX
 gtk-icon-theme-name=PiX

diff --git a/manpath.config b/manpath.config
index 3b5b54f56578edaf7b290285dcbe8e67d8d391b9..bab962423be4b3e886175f1ee418fe33152cb206 100644 (file)
--- a/manpath.config
+++ b/manpath.config
@@ -75,7 +75,7 @@ MANDB_MAP     /opt/man                /var/cache/man/opt
 # of the definition is already the default.  To change: uncomment a
 # definition and modify it.
 #
-#DEFINE        pager   pager -s
+#DEFINE        pager   pager
 #DEFINE        cat     cat
 #DEFINE        tr      tr '\255\267\264\327' '\055\157\047\170'
 #DEFINE                grep    grep

diff --git a/mke2fs.conf b/mke2fs.conf
index 0871f7778734d7e4ed452486c20697c606f77de3..a049d61d597fc2f49644ec616be688dfe3b62740 100644 (file)
--- a/mke2fs.conf
+++ b/mke2fs.conf
@@ -1,5 +1,5 @@
 [defaults]
-       base_features = sparse_super,filetype,resize_inode,dir_index,ext_attr
+       base_features = sparse_super,large_file,filetype,resize_inode,dir_index,ext_attr
        default_mntopts = acl,user_xattr
        enable_periodic_fsck = 0
        blocksize = 4096
@@ -11,12 +11,11 @@
                features = has_journal
        }
        ext4 = {
-               features = has_journal,extent,huge_file,flex_bg,uninit_bg,dir_nlink,extra_isize
-               auto_64-bit_support = 1
+               features = has_journal,extent,huge_file,flex_bg,metadata_csum,64bit,dir_nlink,extra_isize
                inode_size = 256
        }
        ext4dev = {
-               features = has_journal,extent,huge_file,flex_bg,uninit_bg,dir_nlink,extra_isize
+               features = has_journal,extent,huge_file,flex_bg,metadata_csum,inline_data,64bit,dir_nlink,extra_isize
                inode_size = 256
                options = test_fs=1
        }

diff --git a/modprobe.d/blacklist-rtl8192cu.conf b/modprobe.d/blacklist-rtl8192cu.conf
new file mode 100644 (file)
index 0000000..dc07e99
--- /dev/null
+++ b/modprobe.d/blacklist-rtl8192cu.conf
@@ -0,0 +1 @@
+blacklist rtl8192cu

diff --git a/modprobe.d/blacklist-rtl8xxxu.conf b/modprobe.d/blacklist-rtl8xxxu.conf
new file mode 100644 (file)
index 0000000..519cd30
--- /dev/null
+++ b/modprobe.d/blacklist-rtl8xxxu.conf
@@ -0,0 +1 @@
+blacklist rtl8xxxu

diff --git a/rc0.d/K01avahi-daemon b/rc0.d/K01avahi-daemon
new file mode 120000 (symlink)
index 0000000..d28b326
--- /dev/null
+++ b/rc0.d/K01avahi-daemon
@@ -0,0 +1 @@
+../init.d/avahi-daemon
\ No newline at end of file

diff --git a/rc0.d/K01vncserver-x11-serviced b/rc0.d/K01vncserver-x11-serviced
deleted file mode 120000 (symlink)
index 5206efe..0000000
--- a/rc0.d/K01vncserver-x11-serviced
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/vncserver-x11-serviced
\ No newline at end of file

diff --git a/rc0.d/K03avahi-daemon b/rc0.d/K03avahi-daemon
deleted file mode 120000 (symlink)
index d28b326..0000000
--- a/rc0.d/K03avahi-daemon
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/avahi-daemon
\ No newline at end of file

diff --git a/rc0.d/K03sendsigs b/rc0.d/K03sendsigs
new file mode 120000 (symlink)
index 0000000..56bed94
--- /dev/null
+++ b/rc0.d/K03sendsigs
@@ -0,0 +1 @@
+../init.d/sendsigs
\ No newline at end of file

diff --git a/rc0.d/K04rsyslog b/rc0.d/K04rsyslog
new file mode 120000 (symlink)
index 0000000..7000c51
--- /dev/null
+++ b/rc0.d/K04rsyslog
@@ -0,0 +1 @@
+../init.d/rsyslog
\ No newline at end of file

diff --git a/rc0.d/K04sendsigs b/rc0.d/K04sendsigs
deleted file mode 120000 (symlink)
index 56bed94..0000000
--- a/rc0.d/K04sendsigs
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/sendsigs
\ No newline at end of file

diff --git a/rc0.d/K05rsyslog b/rc0.d/K05rsyslog
deleted file mode 120000 (symlink)
index 7000c51..0000000
--- a/rc0.d/K05rsyslog
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/rsyslog
\ No newline at end of file

diff --git a/rc0.d/K05umountnfs.sh b/rc0.d/K05umountnfs.sh
new file mode 120000 (symlink)
index 0000000..c4ed87a
--- /dev/null
+++ b/rc0.d/K05umountnfs.sh
@@ -0,0 +1 @@
+../init.d/umountnfs.sh
\ No newline at end of file

diff --git a/rc0.d/K06nfs-common b/rc0.d/K06nfs-common
new file mode 120000 (symlink)
index 0000000..ac8a4b9
--- /dev/null
+++ b/rc0.d/K06nfs-common
@@ -0,0 +1 @@
+../init.d/nfs-common
\ No newline at end of file

diff --git a/rc0.d/K06rpcbind b/rc0.d/K06rpcbind
new file mode 120000 (symlink)
index 0000000..6c52e6f
--- /dev/null
+++ b/rc0.d/K06rpcbind
@@ -0,0 +1 @@
+../init.d/rpcbind
\ No newline at end of file

diff --git a/rc0.d/K06umountnfs.sh b/rc0.d/K06umountnfs.sh
deleted file mode 120000 (symlink)
index c4ed87a..0000000
--- a/rc0.d/K06umountnfs.sh
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/umountnfs.sh
\ No newline at end of file

diff --git a/rc0.d/K07hwclock.sh b/rc0.d/K07hwclock.sh
new file mode 120000 (symlink)
index 0000000..c2b57ec
--- /dev/null
+++ b/rc0.d/K07hwclock.sh
@@ -0,0 +1 @@
+../init.d/hwclock.sh
\ No newline at end of file

diff --git a/rc0.d/K07networking b/rc0.d/K07networking
new file mode 120000 (symlink)
index 0000000..bd5b2c2
--- /dev/null
+++ b/rc0.d/K07networking
@@ -0,0 +1 @@
+../init.d/networking
\ No newline at end of file

diff --git a/rc0.d/K07nfs-common b/rc0.d/K07nfs-common
deleted file mode 120000 (symlink)
index ac8a4b9..0000000
--- a/rc0.d/K07nfs-common
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/nfs-common
\ No newline at end of file

diff --git a/rc0.d/K07rpcbind b/rc0.d/K07rpcbind
deleted file mode 120000 (symlink)
index 6c52e6f..0000000
--- a/rc0.d/K07rpcbind
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/rpcbind
\ No newline at end of file

diff --git a/rc0.d/K08hwclock.sh b/rc0.d/K08hwclock.sh
deleted file mode 120000 (symlink)
index c2b57ec..0000000
--- a/rc0.d/K08hwclock.sh
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/hwclock.sh
\ No newline at end of file

diff --git a/rc0.d/K08networking b/rc0.d/K08networking
deleted file mode 120000 (symlink)
index bd5b2c2..0000000
--- a/rc0.d/K08networking
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/networking
\ No newline at end of file

diff --git a/rc0.d/K08umountfs b/rc0.d/K08umountfs
new file mode 120000 (symlink)
index 0000000..d29c125
--- /dev/null
+++ b/rc0.d/K08umountfs
@@ -0,0 +1 @@
+../init.d/umountfs
\ No newline at end of file

diff --git a/rc0.d/K09umountfs b/rc0.d/K09umountfs
deleted file mode 120000 (symlink)
index d29c125..0000000
--- a/rc0.d/K09umountfs
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/umountfs
\ No newline at end of file

diff --git a/rc0.d/K09umountroot b/rc0.d/K09umountroot
new file mode 120000 (symlink)
index 0000000..f486c50
--- /dev/null
+++ b/rc0.d/K09umountroot
@@ -0,0 +1 @@
+../init.d/umountroot
\ No newline at end of file

diff --git a/rc0.d/K10halt b/rc0.d/K10halt
new file mode 120000 (symlink)
index 0000000..576e1ef
--- /dev/null
+++ b/rc0.d/K10halt
@@ -0,0 +1 @@
+../init.d/halt
\ No newline at end of file

diff --git a/rc0.d/K10umountroot b/rc0.d/K10umountroot
deleted file mode 120000 (symlink)
index f486c50..0000000
--- a/rc0.d/K10umountroot
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/umountroot
\ No newline at end of file

diff --git a/rc0.d/K11halt b/rc0.d/K11halt
deleted file mode 120000 (symlink)
index 576e1ef..0000000
--- a/rc0.d/K11halt
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/halt
\ No newline at end of file

diff --git a/rc1.d/K01avahi-daemon b/rc1.d/K01avahi-daemon
new file mode 120000 (symlink)
index 0000000..d28b326
--- /dev/null
+++ b/rc1.d/K01avahi-daemon
@@ -0,0 +1 @@
+../init.d/avahi-daemon
\ No newline at end of file

diff --git a/rc1.d/K01vncserver-x11-serviced b/rc1.d/K01vncserver-x11-serviced
deleted file mode 120000 (symlink)
index 5206efe..0000000
--- a/rc1.d/K01vncserver-x11-serviced
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/vncserver-x11-serviced
\ No newline at end of file

diff --git a/rc1.d/K03avahi-daemon b/rc1.d/K03avahi-daemon
deleted file mode 120000 (symlink)
index d28b326..0000000
--- a/rc1.d/K03avahi-daemon
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/avahi-daemon
\ No newline at end of file

diff --git a/rc1.d/K04rsyslog b/rc1.d/K04rsyslog
new file mode 120000 (symlink)
index 0000000..7000c51
--- /dev/null
+++ b/rc1.d/K04rsyslog
@@ -0,0 +1 @@
+../init.d/rsyslog
\ No newline at end of file

diff --git a/rc1.d/K05rsyslog b/rc1.d/K05rsyslog
deleted file mode 120000 (symlink)
index 7000c51..0000000
--- a/rc1.d/K05rsyslog
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/rsyslog
\ No newline at end of file

diff --git a/rc1.d/K06nfs-common b/rc1.d/K06nfs-common
new file mode 120000 (symlink)
index 0000000..ac8a4b9
--- /dev/null
+++ b/rc1.d/K06nfs-common
@@ -0,0 +1 @@
+../init.d/nfs-common
\ No newline at end of file

diff --git a/rc1.d/K06rpcbind b/rc1.d/K06rpcbind
new file mode 120000 (symlink)
index 0000000..6c52e6f
--- /dev/null
+++ b/rc1.d/K06rpcbind
@@ -0,0 +1 @@
+../init.d/rpcbind
\ No newline at end of file

diff --git a/rc1.d/K07nfs-common b/rc1.d/K07nfs-common
deleted file mode 120000 (symlink)
index ac8a4b9..0000000
--- a/rc1.d/K07nfs-common
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/nfs-common
\ No newline at end of file

diff --git a/rc1.d/K07rpcbind b/rc1.d/K07rpcbind
deleted file mode 120000 (symlink)
index 6c52e6f..0000000
--- a/rc1.d/K07rpcbind
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/rpcbind
\ No newline at end of file

diff --git a/rc2.d/S02vncserver-x11-serviced b/rc2.d/S02vncserver-x11-serviced
deleted file mode 120000 (symlink)
index 5206efe..0000000
--- a/rc2.d/S02vncserver-x11-serviced
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/vncserver-x11-serviced
\ No newline at end of file

diff --git a/rc2.d/S06plymouth b/rc2.d/S06plymouth
deleted file mode 120000 (symlink)
index 1bede9b..0000000
--- a/rc2.d/S06plymouth
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/plymouth
\ No newline at end of file

diff --git a/rc2.d/S06rc.local b/rc2.d/S06rc.local
deleted file mode 120000 (symlink)
index fb4ee0a..0000000
--- a/rc2.d/S06rc.local
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/rc.local
\ No newline at end of file

diff --git a/rc2.d/S06rmnologin b/rc2.d/S06rmnologin
deleted file mode 120000 (symlink)
index 3000cf9..0000000
--- a/rc2.d/S06rmnologin
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/rmnologin
\ No newline at end of file

diff --git a/rc2.d/S17raspi-config b/rc2.d/S17raspi-config
new file mode 120000 (symlink)
index 0000000..8b8730b
--- /dev/null
+++ b/rc2.d/S17raspi-config
@@ -0,0 +1 @@
+../init.d/raspi-config
\ No newline at end of file

diff --git a/rc2.d/S18plymouth b/rc2.d/S18plymouth
new file mode 120000 (symlink)
index 0000000..1bede9b
--- /dev/null
+++ b/rc2.d/S18plymouth
@@ -0,0 +1 @@
+../init.d/plymouth
\ No newline at end of file

diff --git a/rc2.d/S18rc.local b/rc2.d/S18rc.local
new file mode 120000 (symlink)
index 0000000..fb4ee0a
--- /dev/null
+++ b/rc2.d/S18rc.local
@@ -0,0 +1 @@
+../init.d/rc.local
\ No newline at end of file

diff --git a/rc2.d/S18rmnologin b/rc2.d/S18rmnologin
new file mode 120000 (symlink)
index 0000000..3000cf9
--- /dev/null
+++ b/rc2.d/S18rmnologin
@@ -0,0 +1 @@
+../init.d/rmnologin
\ No newline at end of file

diff --git a/rc3.d/S02vncserver-x11-serviced b/rc3.d/S02vncserver-x11-serviced
deleted file mode 120000 (symlink)
index 5206efe..0000000
--- a/rc3.d/S02vncserver-x11-serviced
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/vncserver-x11-serviced
\ No newline at end of file

diff --git a/rc3.d/S06plymouth b/rc3.d/S06plymouth
deleted file mode 120000 (symlink)
index 1bede9b..0000000
--- a/rc3.d/S06plymouth
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/plymouth
\ No newline at end of file

diff --git a/rc3.d/S06rc.local b/rc3.d/S06rc.local
deleted file mode 120000 (symlink)
index fb4ee0a..0000000
--- a/rc3.d/S06rc.local
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/rc.local
\ No newline at end of file

diff --git a/rc3.d/S06rmnologin b/rc3.d/S06rmnologin
deleted file mode 120000 (symlink)
index 3000cf9..0000000
--- a/rc3.d/S06rmnologin
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/rmnologin
\ No newline at end of file

diff --git a/rc3.d/S17raspi-config b/rc3.d/S17raspi-config
new file mode 120000 (symlink)
index 0000000..8b8730b
--- /dev/null
+++ b/rc3.d/S17raspi-config
@@ -0,0 +1 @@
+../init.d/raspi-config
\ No newline at end of file

diff --git a/rc3.d/S18plymouth b/rc3.d/S18plymouth
new file mode 120000 (symlink)
index 0000000..1bede9b
--- /dev/null
+++ b/rc3.d/S18plymouth
@@ -0,0 +1 @@
+../init.d/plymouth
\ No newline at end of file

diff --git a/rc3.d/S18rc.local b/rc3.d/S18rc.local
new file mode 120000 (symlink)
index 0000000..fb4ee0a
--- /dev/null
+++ b/rc3.d/S18rc.local
@@ -0,0 +1 @@
+../init.d/rc.local
\ No newline at end of file

diff --git a/rc3.d/S18rmnologin b/rc3.d/S18rmnologin
new file mode 120000 (symlink)
index 0000000..3000cf9
--- /dev/null
+++ b/rc3.d/S18rmnologin
@@ -0,0 +1 @@
+../init.d/rmnologin
\ No newline at end of file

diff --git a/rc4.d/S02vncserver-x11-serviced b/rc4.d/S02vncserver-x11-serviced
deleted file mode 120000 (symlink)
index 5206efe..0000000
--- a/rc4.d/S02vncserver-x11-serviced
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/vncserver-x11-serviced
\ No newline at end of file

diff --git a/rc4.d/S06plymouth b/rc4.d/S06plymouth
deleted file mode 120000 (symlink)
index 1bede9b..0000000
--- a/rc4.d/S06plymouth
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/plymouth
\ No newline at end of file

diff --git a/rc4.d/S06rc.local b/rc4.d/S06rc.local
deleted file mode 120000 (symlink)
index fb4ee0a..0000000
--- a/rc4.d/S06rc.local
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/rc.local
\ No newline at end of file

diff --git a/rc4.d/S06rmnologin b/rc4.d/S06rmnologin
deleted file mode 120000 (symlink)
index 3000cf9..0000000
--- a/rc4.d/S06rmnologin
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/rmnologin
\ No newline at end of file

diff --git a/rc4.d/S17raspi-config b/rc4.d/S17raspi-config
new file mode 120000 (symlink)
index 0000000..8b8730b
--- /dev/null
+++ b/rc4.d/S17raspi-config
@@ -0,0 +1 @@
+../init.d/raspi-config
\ No newline at end of file

diff --git a/rc4.d/S18plymouth b/rc4.d/S18plymouth
new file mode 120000 (symlink)
index 0000000..1bede9b
--- /dev/null
+++ b/rc4.d/S18plymouth
@@ -0,0 +1 @@
+../init.d/plymouth
\ No newline at end of file

diff --git a/rc4.d/S18rc.local b/rc4.d/S18rc.local
new file mode 120000 (symlink)
index 0000000..fb4ee0a
--- /dev/null
+++ b/rc4.d/S18rc.local
@@ -0,0 +1 @@
+../init.d/rc.local
\ No newline at end of file

diff --git a/rc4.d/S18rmnologin b/rc4.d/S18rmnologin
new file mode 120000 (symlink)
index 0000000..3000cf9
--- /dev/null
+++ b/rc4.d/S18rmnologin
@@ -0,0 +1 @@
+../init.d/rmnologin
\ No newline at end of file

diff --git a/rc5.d/S02vncserver-x11-serviced b/rc5.d/S02vncserver-x11-serviced
deleted file mode 120000 (symlink)
index 5206efe..0000000
--- a/rc5.d/S02vncserver-x11-serviced
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/vncserver-x11-serviced
\ No newline at end of file

diff --git a/rc5.d/S06plymouth b/rc5.d/S06plymouth
deleted file mode 120000 (symlink)
index 1bede9b..0000000
--- a/rc5.d/S06plymouth
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/plymouth
\ No newline at end of file

diff --git a/rc5.d/S06rc.local b/rc5.d/S06rc.local
deleted file mode 120000 (symlink)
index fb4ee0a..0000000
--- a/rc5.d/S06rc.local
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/rc.local
\ No newline at end of file

diff --git a/rc5.d/S06rmnologin b/rc5.d/S06rmnologin
deleted file mode 120000 (symlink)
index 3000cf9..0000000
--- a/rc5.d/S06rmnologin
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/rmnologin
\ No newline at end of file

diff --git a/rc5.d/S17raspi-config b/rc5.d/S17raspi-config
new file mode 120000 (symlink)
index 0000000..8b8730b
--- /dev/null
+++ b/rc5.d/S17raspi-config
@@ -0,0 +1 @@
+../init.d/raspi-config
\ No newline at end of file

diff --git a/rc5.d/S18plymouth b/rc5.d/S18plymouth
new file mode 120000 (symlink)
index 0000000..1bede9b
--- /dev/null
+++ b/rc5.d/S18plymouth
@@ -0,0 +1 @@
+../init.d/plymouth
\ No newline at end of file

diff --git a/rc5.d/S18rc.local b/rc5.d/S18rc.local
new file mode 120000 (symlink)
index 0000000..fb4ee0a
--- /dev/null
+++ b/rc5.d/S18rc.local
@@ -0,0 +1 @@
+../init.d/rc.local
\ No newline at end of file

diff --git a/rc5.d/S18rmnologin b/rc5.d/S18rmnologin
new file mode 120000 (symlink)
index 0000000..3000cf9
--- /dev/null
+++ b/rc5.d/S18rmnologin
@@ -0,0 +1 @@
+../init.d/rmnologin
\ No newline at end of file

diff --git a/rc6.d/K01avahi-daemon b/rc6.d/K01avahi-daemon
new file mode 120000 (symlink)
index 0000000..d28b326
--- /dev/null
+++ b/rc6.d/K01avahi-daemon
@@ -0,0 +1 @@
+../init.d/avahi-daemon
\ No newline at end of file

diff --git a/rc6.d/K01vncserver-x11-serviced b/rc6.d/K01vncserver-x11-serviced
deleted file mode 120000 (symlink)
index 5206efe..0000000
--- a/rc6.d/K01vncserver-x11-serviced
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/vncserver-x11-serviced
\ No newline at end of file

diff --git a/rc6.d/K03avahi-daemon b/rc6.d/K03avahi-daemon
deleted file mode 120000 (symlink)
index d28b326..0000000
--- a/rc6.d/K03avahi-daemon
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/avahi-daemon
\ No newline at end of file

diff --git a/rc6.d/K03sendsigs b/rc6.d/K03sendsigs
new file mode 120000 (symlink)
index 0000000..56bed94
--- /dev/null
+++ b/rc6.d/K03sendsigs
@@ -0,0 +1 @@
+../init.d/sendsigs
\ No newline at end of file

diff --git a/rc6.d/K04rsyslog b/rc6.d/K04rsyslog
new file mode 120000 (symlink)
index 0000000..7000c51
--- /dev/null
+++ b/rc6.d/K04rsyslog
@@ -0,0 +1 @@
+../init.d/rsyslog
\ No newline at end of file

diff --git a/rc6.d/K04sendsigs b/rc6.d/K04sendsigs
deleted file mode 120000 (symlink)
index 56bed94..0000000
--- a/rc6.d/K04sendsigs
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/sendsigs
\ No newline at end of file

diff --git a/rc6.d/K05rsyslog b/rc6.d/K05rsyslog
deleted file mode 120000 (symlink)
index 7000c51..0000000
--- a/rc6.d/K05rsyslog
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/rsyslog
\ No newline at end of file

diff --git a/rc6.d/K05umountnfs.sh b/rc6.d/K05umountnfs.sh
new file mode 120000 (symlink)
index 0000000..c4ed87a
--- /dev/null
+++ b/rc6.d/K05umountnfs.sh
@@ -0,0 +1 @@
+../init.d/umountnfs.sh
\ No newline at end of file

diff --git a/rc6.d/K06nfs-common b/rc6.d/K06nfs-common
new file mode 120000 (symlink)
index 0000000..ac8a4b9
--- /dev/null
+++ b/rc6.d/K06nfs-common
@@ -0,0 +1 @@
+../init.d/nfs-common
\ No newline at end of file

diff --git a/rc6.d/K06rpcbind b/rc6.d/K06rpcbind
new file mode 120000 (symlink)
index 0000000..6c52e6f
--- /dev/null
+++ b/rc6.d/K06rpcbind
@@ -0,0 +1 @@
+../init.d/rpcbind
\ No newline at end of file

diff --git a/rc6.d/K06umountnfs.sh b/rc6.d/K06umountnfs.sh
deleted file mode 120000 (symlink)
index c4ed87a..0000000
--- a/rc6.d/K06umountnfs.sh
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/umountnfs.sh
\ No newline at end of file

diff --git a/rc6.d/K07hwclock.sh b/rc6.d/K07hwclock.sh
new file mode 120000 (symlink)
index 0000000..c2b57ec
--- /dev/null
+++ b/rc6.d/K07hwclock.sh
@@ -0,0 +1 @@
+../init.d/hwclock.sh
\ No newline at end of file

diff --git a/rc6.d/K07networking b/rc6.d/K07networking
new file mode 120000 (symlink)
index 0000000..bd5b2c2
--- /dev/null
+++ b/rc6.d/K07networking
@@ -0,0 +1 @@
+../init.d/networking
\ No newline at end of file

diff --git a/rc6.d/K07nfs-common b/rc6.d/K07nfs-common
deleted file mode 120000 (symlink)
index ac8a4b9..0000000
--- a/rc6.d/K07nfs-common
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/nfs-common
\ No newline at end of file

diff --git a/rc6.d/K07rpcbind b/rc6.d/K07rpcbind
deleted file mode 120000 (symlink)
index 6c52e6f..0000000
--- a/rc6.d/K07rpcbind
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/rpcbind
\ No newline at end of file

diff --git a/rc6.d/K08hwclock.sh b/rc6.d/K08hwclock.sh
deleted file mode 120000 (symlink)
index c2b57ec..0000000
--- a/rc6.d/K08hwclock.sh
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/hwclock.sh
\ No newline at end of file

diff --git a/rc6.d/K08networking b/rc6.d/K08networking
deleted file mode 120000 (symlink)
index bd5b2c2..0000000
--- a/rc6.d/K08networking
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/networking
\ No newline at end of file

diff --git a/rc6.d/K08umountfs b/rc6.d/K08umountfs
new file mode 120000 (symlink)
index 0000000..d29c125
--- /dev/null
+++ b/rc6.d/K08umountfs
@@ -0,0 +1 @@
+../init.d/umountfs
\ No newline at end of file

diff --git a/rc6.d/K09umountfs b/rc6.d/K09umountfs
deleted file mode 120000 (symlink)
index d29c125..0000000
--- a/rc6.d/K09umountfs
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/umountfs
\ No newline at end of file

diff --git a/rc6.d/K09umountroot b/rc6.d/K09umountroot
new file mode 120000 (symlink)
index 0000000..f486c50
--- /dev/null
+++ b/rc6.d/K09umountroot
@@ -0,0 +1 @@
+../init.d/umountroot
\ No newline at end of file

diff --git a/rc6.d/K10reboot b/rc6.d/K10reboot
new file mode 120000 (symlink)
index 0000000..a28e7a4
--- /dev/null
+++ b/rc6.d/K10reboot
@@ -0,0 +1 @@
+../init.d/reboot
\ No newline at end of file

diff --git a/rc6.d/K10umountroot b/rc6.d/K10umountroot
deleted file mode 120000 (symlink)
index f486c50..0000000
--- a/rc6.d/K10umountroot
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/umountroot
\ No newline at end of file

diff --git a/rc6.d/K11reboot b/rc6.d/K11reboot
deleted file mode 120000 (symlink)
index a28e7a4..0000000
--- a/rc6.d/K11reboot
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/reboot
\ No newline at end of file

diff --git a/systemd/system/multi-user.target.wants/sshswitch.service b/systemd/system/multi-user.target.wants/sshswitch.service
new file mode 120000 (symlink)
index 0000000..db8ab1f
--- /dev/null
+++ b/systemd/system/multi-user.target.wants/sshswitch.service
@@ -0,0 +1 @@
+/lib/systemd/system/sshswitch.service
\ No newline at end of file

diff --git a/vnc/licensekeys/vncserver/f5915f84-ba51-49ef-8a3b-c92db490e8d1-7cdd908b2399 b/vnc/licensekeys/vncserver/f5915f84-ba51-49ef-8a3b-c92db490e8d1-7cdd908b2399
deleted file mode 100644 (file)
index e1deeab..0000000
--- a/vnc/licensekeys/vncserver/f5915f84-ba51-49ef-8a3b-c92db490e8d1-7cdd908b2399
+++ /dev/null
@@ -1,6 +0,0 @@
-Summary=RaspberryPi
-Serial=f5915f84-ba51-49ef-8a3b-c92db490e8d1
-ValidForMachine=7cdd908b2399
------BEGIN REALVNC LICENSE V1-----
-GIdYqYqAqtCIsZh5FHrRd+9sX6wa1EFZ6XSV72TUqVFYiOr85AsiX9IpxqgD7vOnmz0pvsjupnQX1y4hI12DDGaOQGZukj5LNkX1gwA4gMS7a3Fiku8lcG5Ul8OtEcaZ3B2I1/hEMzkgwNyfh3QPgwcTeGkgvbbRjYMxQUaj5AfpN+hUB5hwc47SFtYbNnP6b8DNyMe7T2MD87xjPuaHJVOEjg0ZD0R+YOrdba2PFrF6XqnyZfBYcJ7Ro1JmVF6QV7Q5F9QNRUaamrXXbxOIlhEWnTCT4O/baV1Ls+0cdlrCy9w8raxbnxGsBRqgN1dID/4mBboLjC2ygvZDzlu25a74chAt9l9ab3Mh5YRsZGd283wTRDbdw+ZimIdjNU/U+e8esjYyDqKQgQrxif02zbWsPyBGgw2ypFRRsw+0RsAVTWeLTmEtCVl8TGt+pCXJ6luim9dfmzk6fWytxrEspZnav3w2nE9wZknYI0K1VJNN/DUD8ixCBrBREC3SzMvqrT3hNHHc27hlWj9JX5E6Ej+nb2Jcrs+FUrXlbcnfujCHTNrkYeAdPHZv4xcPiJ9CGKOEJdvS9MDAr/JfHUknocrXmALj2wTwN9v4vdZ8ws9jU/Ym64SW7fNqn4ePs5mW9QitjuVs4KId2FPDLcCqvdO1h96RNRpKLuPQPBiUyiE=NJCHCP5FBHR8EG6J6JXX
------END REALVNC LICENSE V1-----

diff --git a/vnc/xstartup b/vnc/xstartup
index 55166f16bc8164807b12c6c5553a0e72357dca97..65782b5363d7daf6b6e95fadbb00bf05a16b83ce 100755 (executable)
--- a/vnc/xstartup
+++ b/vnc/xstartup
@@ -27,7 +27,7 @@ fi
 xsetroot -solid grey
 
 if [ -f /usr/bin/gnome-session ]; then
-  # Some gnome session types won't work with Xvnc, try to pick a sensible 
+  # Some gnome session types won't work with Xvnc, try to pick a sensible
   # default.
   for SESSION in "ubuntu-2d" "2d-gnome" "gnome-classic" "gnome-fallback"; do
     if [ -f /usr/share/gnome-session/sessions/$SESSION.session ]; then
@@ -48,7 +48,7 @@ elif [ -x /etc/X11/gdm/Xsession ]; then SESSIONBIN="/etc/X11/gdm/Xsession gnome-
 elif [ -x /etc/gdm/Xsession ]; then SESSIONBIN="/etc/gdm/Xsession gnome-session"
 elif [ -x /etc/kde/kdm/Xsession ]; then SESSIONBIN="/etc/kde/kdm/Xsession"
 elif [ -x /usr/dt/bin/Xsession ]; then
-  XSTATION=1 
+  XSTATION=1
   DTXSERVERLOCATION=local
   export XSTATION DTXSERVERLOCATION
   SESSIONBIN="/usr/dt/bin/Xsession"