meta-digi: remove not needed files
These files were needed in previous versions of Yocto to overcome different problems. Remove them as the default ones in current Yocto version are good enough for our platforms. Signed-off-by: Javier Viguera <javier.viguera@digi.com>
This commit is contained in:
Javier Viguera
parent
b29a00fea6
commit
987418e5ee
|
|
@ -1,19 +0,0 @@
|
|||
# There are a number of modifiers that are allowed to be used in some
|
||||
# of the different fields. They provide the following subsitutions:
|
||||
#
|
||||
# %n the "kernel number" of the device.
|
||||
# For example, 'sda3' has a "kernel number" of '3'
|
||||
# %e the smallest number for that name which does not matches an existing node
|
||||
# %k the kernel name for the device
|
||||
# %M the kernel major number for the device
|
||||
# %m the kernel minor number for the device
|
||||
# %b the bus id for the device
|
||||
# %c the string returned by the PROGRAM
|
||||
# %s{filename} the content of a sysfs attribute
|
||||
# %% the '%' char itself
|
||||
#
|
||||
|
||||
# Media automounting
|
||||
SUBSYSTEM=="block", ENV{DEVTYPE}=="partition", ACTION=="add" RUN+="/etc/udev/scripts/mount.sh"
|
||||
SUBSYSTEM=="block", ENV{DEVTYPE}=="partition", ACTION=="remove" RUN+="/etc/udev/scripts/mount.sh"
|
||||
|
||||
|
|
@ -1,76 +0,0 @@
|
|||
#!/bin/sh
|
||||
#
|
||||
# Called from udev
|
||||
#
|
||||
# Attempt to mount any added block devices and umount any removed devices
|
||||
|
||||
|
||||
MOUNT="/bin/mount"
|
||||
PMOUNT="/usr/bin/pmount"
|
||||
UMOUNT="/bin/umount"
|
||||
for line in `grep -v ^# /etc/udev/mount.blacklist`
|
||||
do
|
||||
if [ ` expr match "$DEVNAME" "$line" ` -gt 0 ];
|
||||
then
|
||||
logger "udev/mount.sh" "[$DEVNAME] is blacklisted, ignoring"
|
||||
exit 0
|
||||
fi
|
||||
done
|
||||
|
||||
automount() {
|
||||
name="`basename "$DEVNAME"`"
|
||||
|
||||
! test -d "/media/$name" && mkdir -p "/media/$name"
|
||||
# Silent util-linux's version of mounting auto
|
||||
if [ "x`readlink $MOUNT`" = "x/bin/mount.util-linux" ] ;
|
||||
then
|
||||
MOUNT="$MOUNT -o silent"
|
||||
fi
|
||||
|
||||
if ! $MOUNT -t auto $DEVNAME "/media/$name"
|
||||
then
|
||||
#logger "mount.sh/automount" "$MOUNT -t auto $DEVNAME \"/media/$name\" failed!"
|
||||
rm_dir "/media/$name"
|
||||
else
|
||||
logger "mount.sh/automount" "Auto-mount of [/media/$name] successful"
|
||||
touch "/tmp/.automount-$name"
|
||||
fi
|
||||
}
|
||||
|
||||
rm_dir() {
|
||||
# We do not want to rm -r populated directories
|
||||
if test "`find "$1" | wc -l | tr -d " "`" -lt 2 -a -d "$1"
|
||||
then
|
||||
! test -z "$1" && rm -r "$1"
|
||||
else
|
||||
logger "mount.sh/automount" "Not removing non-empty directory [$1]"
|
||||
fi
|
||||
}
|
||||
|
||||
if [ "$ACTION" = "add" ] && [ -n "$DEVNAME" ] && [ -n "$ID_FS_TYPE" ]; then
|
||||
if [ -x "$PMOUNT" ]; then
|
||||
$PMOUNT $DEVNAME 2> /dev/null
|
||||
elif [ -x $MOUNT ]; then
|
||||
$MOUNT $DEVNAME 2> /dev/null
|
||||
fi
|
||||
|
||||
# If the device isn't mounted at this point, it isn't
|
||||
# configured in fstab (note the root filesystem can show up as
|
||||
# /dev/root in /proc/mounts, so check the device number too)
|
||||
if expr $MAJOR "*" 256 + $MINOR != `stat -c %d /`; then
|
||||
grep -q "^$DEVNAME " /proc/mounts || automount
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
|
||||
if [ "$ACTION" = "remove" ] && [ -x "$UMOUNT" ] && [ -n "$DEVNAME" ]; then
|
||||
for mnt in `cat /proc/mounts | grep "$DEVNAME" | cut -f 2 -d " " `
|
||||
do
|
||||
$UMOUNT $mnt
|
||||
done
|
||||
|
||||
# Remove empty directories from auto-mounter
|
||||
name="`basename "$DEVNAME"`"
|
||||
test -e "/tmp/.automount-$name" && rm_dir "/media/$name"
|
||||
fi
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
rootfs / auto noatime 1 1
|
||||
proc /proc proc defaults 0 0
|
||||
devpts /dev/pts devpts mode=0620,gid=5 0 0
|
||||
usbdevfs /proc/bus/usb usbdevfs noauto 0 0
|
||||
tmpfs /var/volatile tmpfs defaults 0 0
|
||||
tmpfs /media/ram tmpfs defaults 0 0
|
||||
|
|
@ -1,148 +0,0 @@
|
|||
#!/bin/sh
|
||||
### BEGIN INIT INFO
|
||||
# Provides: checkroot
|
||||
# Required-Start: udev
|
||||
# Required-Stop:
|
||||
# Default-Start: S
|
||||
# Default-Stop:
|
||||
# Short-Description: Check to root file system.
|
||||
### END INIT INFO
|
||||
|
||||
. /etc/default/rcS
|
||||
|
||||
#
|
||||
# Set SULOGIN in /etc/default/rcS to yes if you want a sulogin to be spawned
|
||||
# from this script *before anything else* with a timeout, like SCO does.
|
||||
#
|
||||
test "$SULOGIN" = yes && sulogin -t 30 $CONSOLE
|
||||
|
||||
#
|
||||
# Read /etc/fstab.
|
||||
#
|
||||
exec 9< /etc/fstab
|
||||
rootmode=rw
|
||||
rootopts=rw
|
||||
rootcheck=$ENABLE_ROOTFS_FSCK
|
||||
swap_on_md=no
|
||||
devfs=
|
||||
while read fs mnt type opts dump pass junk <&9
|
||||
do
|
||||
case "$fs" in
|
||||
""|\#*)
|
||||
continue;
|
||||
;;
|
||||
/dev/md*)
|
||||
# Swap on md device.
|
||||
test "$type" = swap && swap_on_md=yes
|
||||
;;
|
||||
/dev/*)
|
||||
;;
|
||||
*)
|
||||
# Might be a swapfile.
|
||||
test "$type" = swap && swap_on_md=yes
|
||||
;;
|
||||
esac
|
||||
test "$type" = devfs && devfs="$fs"
|
||||
test "$mnt" != / && continue
|
||||
rootopts="$opts"
|
||||
test "$pass" = 0 -o "$pass" = "" && rootcheck=no
|
||||
case "$opts" in
|
||||
ro|ro,*|*,ro|*,ro,*)
|
||||
rootmode=ro
|
||||
;;
|
||||
esac
|
||||
done
|
||||
exec 0>&9 9>&-
|
||||
|
||||
# Check for conflicting configurations
|
||||
if [ "$rootmode" = "ro" -a "$ROOTFS_READ_ONLY" = "no" ] || \
|
||||
[ "$rootmode" = "rw" -a "$ROOTFS_READ_ONLY" = "yes" ]; then
|
||||
echo ""
|
||||
echo "WARN: conflicting configurations in /etc/fstab and /etc/default/rcS"
|
||||
echo " regarding the writability of rootfs. Please fix one of them."
|
||||
echo ""
|
||||
fi
|
||||
|
||||
|
||||
#
|
||||
# Activate the swap device(s) in /etc/fstab. This needs to be done
|
||||
# before fsck, since fsck can be quite memory-hungry.
|
||||
#
|
||||
test "$VERBOSE" != no && echo "Activating swap"
|
||||
swapon -a 2> /dev/null
|
||||
|
||||
#
|
||||
# Check the root filesystem.
|
||||
#
|
||||
if test -f /fastboot || test $rootcheck = no
|
||||
then
|
||||
test $rootcheck = yes && echo "Fast boot, no filesystem check"
|
||||
else
|
||||
#
|
||||
# Ensure that root is quiescent and read-only before fsck'ing.
|
||||
#
|
||||
mount -n -o remount,ro /
|
||||
if test $? = 0
|
||||
then
|
||||
if test -f /forcefsck
|
||||
then
|
||||
force="-f"
|
||||
else
|
||||
force=""
|
||||
fi
|
||||
if test "$FSCKFIX" = yes
|
||||
then
|
||||
fix="-y"
|
||||
else
|
||||
fix="-a"
|
||||
fi
|
||||
spinner="-C"
|
||||
case "$TERM" in
|
||||
dumb|network|unknown|"") spinner="" ;;
|
||||
esac
|
||||
test `uname -m` = s390 && spinner="" # This should go away
|
||||
test "$VERBOSE" != no && echo "Checking root filesystem..."
|
||||
fsck $spinner $force $fix /
|
||||
#
|
||||
# If there was a failure, drop into single-user mode.
|
||||
#
|
||||
# NOTE: "failure" is defined as exiting with a return code of
|
||||
# 2 or larger. A return code of 1 indicates that filesystem
|
||||
# errors were corrected but that the boot may proceed.
|
||||
#
|
||||
if test "$?" -gt 1
|
||||
then
|
||||
# Surprise! Re-directing from a HERE document (as in
|
||||
# "cat << EOF") won't work, because the root is read-only.
|
||||
echo
|
||||
echo "fsck failed. Please repair manually and reboot. Please note"
|
||||
echo "that the root filesystem is currently mounted read-only. To"
|
||||
echo "remount it read-write:"
|
||||
echo
|
||||
echo " # mount -n -o remount,rw /"
|
||||
echo
|
||||
echo "CONTROL-D will exit from this shell and REBOOT the system."
|
||||
echo
|
||||
# Start a single user shell on the console
|
||||
/sbin/sulogin $CONSOLE
|
||||
reboot -f
|
||||
fi
|
||||
else
|
||||
echo "*** ERROR! Cannot fsck root fs because it is not mounted read-only!"
|
||||
echo
|
||||
fi
|
||||
fi
|
||||
|
||||
#
|
||||
# If the root filesystem was not marked as read-only in /etc/fstab,
|
||||
# remount the rootfs rw but do not try to change mtab because it
|
||||
# is on a ro fs until the remount succeeded. Then clean up old mtabs
|
||||
# and finally write the new mtab.
|
||||
#
|
||||
mount -n -o remount,$rootmode,$rootopts /
|
||||
if test "$rootmode" = rw
|
||||
then
|
||||
ln -sf /proc/mounts /dev/mtab
|
||||
fi
|
||||
|
||||
: exit 0
|
||||
Loading…
Reference in New Issue