diff --git a/board/common/cleanups.sh b/board/common/cleanups.sh index 2cb0787d5a..8be357b433 100755 --- a/board/common/cleanups.sh +++ b/board/common/cleanups.sh @@ -11,10 +11,12 @@ rm -f $TARGET/boot/.gitkeep rm -rf $TARGET/etc/network/ rm -rf $TARGET/etc/dhcp/ rm -rf $TARGET/etc/ssh/ -rm -rf $TARGET/etc/rc_keymaps -rm -rf $TARGET/etc/default -rm -rf $TARGET/etc/ctdb -rm -rf $TARGET/etc/sudoers.d +rm -rf $TARGET/etc/rc_keymaps/ +rm -rf $TARGET/etc/default/ +rm -rf $TARGET/etc/ctdb/ +rm -rf $TARGET/etc/sudoers.d/ + +rm -rf $TARGET/data/* rm -f $TARGET/etc/rc_maps.cfg rm -f $TARGET/etc/udev/hwdb.d/20-pci-vendor-model.hwdb @@ -23,11 +25,11 @@ rm -f $TARGET/etc/hostname rm -f $TARGET/etc/os-release # /usr/share stuff -rm -rf $TARGET/usr/share/bash-completion +rm -rf $TARGET/usr/share/bash-completion/ rm -rf $TARGET/usr/share/locale/* -rm -rf $TARGET/usr/share/ffmpeg -rm -rf $TARGET/usr/share/perl5 -rm -rf $TARGET/usr/share/common-lisp +rm -rf $TARGET/usr/share/ffmpeg/ +rm -rf $TARGET/usr/share/perl5/ +rm -rf $TARGET/usr/share/common-lisp/ find $TARGET -name '*libmount*' | xargs rm -f @@ -152,10 +154,10 @@ rm -f $TARGET/usr/sbin/winbindd rm -f $TARGET/usr/share/perl5 # unused python folders -rm -rf $TARGET/usr/lib/python2.7/site-packages/samba -rm -rf $TARGET/usr/lib/python2.7/ensurepip +rm -rf $TARGET/usr/lib/python2.7/site-packages/samba/ +rm -rf $TARGET/usr/lib/python2.7/ensurepip/ -# unused startup scripts +# startup scripts rm -f $TARGET/etc/init.d/S01logging rm -f $TARGET/etc/init.d/S15watchdog rm -f $TARGET/etc/init.d/S49ntp diff --git a/board/common/overlay/etc/init.d/S02modules b/board/common/overlay/etc/init.d/S02modules index 62660890dc..8e1b5a9fd8 100755 --- a/board/common/overlay/etc/init.d/S02modules +++ b/board/common/overlay/etc/init.d/S02modules @@ -10,11 +10,11 @@ case "$1" in msg_begin "Loading kernel modules" if [ -r $sys_modules_file ]; then - cat $sys_modules_file | while read line; do test -n "$line" && /sbin/modprobe $line; done + cat $sys_modules_file | while read line; do test -n "$line" && /sbin/modprobe $line &>/dev/null; done fi if [ -r $modules_file ]; then - cat $modules_file | while read line; do test -n "$line" && /sbin/modprobe $line; done + cat $modules_file | while read line; do test -n "$line" && /sbin/modprobe $line &>/dev/null; done fi msg_done diff --git a/board/common/overlay/etc/version b/board/common/overlay/etc/version index 64f17872ba..40a7cef221 100644 --- a/board/common/overlay/etc/version +++ b/board/common/overlay/etc/version @@ -1,4 +1,4 @@ os_name="motionEyeOS" os_short_name="motioneyeos" os_prefix="meye" -os_version="20151123" +os_version="20151128"