Skip to content
This repository was archived by the owner on Feb 27, 2025. It is now read-only.

Commit 49a7c06

Browse files
Remove the symbolic link /lib/modules.
Change init script (rcS) to add symbolic links for each module file. Fix formatting in init script (rcS).
1 parent c954a99 commit 49a7c06

File tree

2 files changed

+51
-43
lines changed

2 files changed

+51
-43
lines changed

OS/buildroot/overlay/etc/init.d/rcS

Lines changed: 51 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ if [ -r /etc/default/rcS ]
66
then
77
. /etc/default/rcS
88
else
9-
echo "/etc/default/rcS not found."
9+
echo "/etc/default/rcS not found."
1010
fi
1111

1212
echo "++ Mounting filesystems"
@@ -19,18 +19,18 @@ system1_version=$(awk "{print \$3}" /media/system1/version 2> /dev/null)
1919

2020
# Non-numbers get set to -1
2121
if ! echo $system0_version | egrep -q '^[0-9]+$'; then
22-
system0_version=-1
22+
system0_version=-1
2323
fi
2424
if ! echo $system1_version | egrep -q '^[0-9]+$'; then
25-
system1_version=-1
25+
system1_version=-1
2626
fi
2727

2828
if [ "$system0_version" -gt "$system1_version" ]; then
29-
active_system=/media/system0
30-
inactive_system=/media/system1
29+
active_system=/media/system0
30+
inactive_system=/media/system1
3131
else
32-
active_system=/media/system1
33-
inactive_system=/media/system0
32+
active_system=/media/system1
33+
inactive_system=/media/system0
3434
fi
3535

3636
# Set active/inactive system
@@ -43,6 +43,15 @@ ln -s $inactive_system /media/inactive_system
4343
# Set hostname
4444
hostname -F /etc/hostname
4545

46+
# Link modules from /media/system/lib/modules/... to /lib/modules/...
47+
MODPATH=lib/modules/$(uname -r)
48+
mkdir -p /$MODPATH
49+
for i in /media/system/$MODPATH/* ;do
50+
# Ignore dangling symlinks (if any).
51+
[ ! -f "$i" ] && continue
52+
ln -s $i /$MODPATH/$(basename $i)
53+
done
54+
4655
# Create modules.* files in /lib/modules/...
4756
depmod
4857

@@ -102,51 +111,51 @@ echo "++ Running all startup scripts"
102111
# Modules
103112
for i in /etc/init.d/M??* ;do
104113

105-
# Ignore dangling symlinks (if any).
106-
[ ! -f "$i" ] && continue
107-
108-
case "$i" in
109-
*.sh)
110-
# Source shell script for speed.
111-
(
112-
trap - INT QUIT TSTP
113-
set insert
114-
. $i
115-
)
116-
;;
117-
*)
118-
# No sh extension, so fork subprocess.
119-
$i insert
120-
;;
121-
esac
114+
# Ignore dangling symlinks (if any).
115+
[ ! -f "$i" ] && continue
116+
117+
case "$i" in
118+
*.sh)
119+
# Source shell script for speed.
120+
(
121+
trap - INT QUIT TSTP
122+
set insert
123+
. $i
124+
)
125+
;;
126+
*)
127+
# No sh extension, so fork subprocess.
128+
$i insert
129+
;;
130+
esac
122131
done
123132

124133
# Synchronuous scripts in order
125134
for i in /etc/init.d/S??* ;do
126135

127-
# Ignore dangling symlinks (if any).
128-
[ ! -f "$i" ] && continue
129-
130-
case "$i" in
131-
*.sh)
132-
# Source shell script for speed.
133-
(
134-
trap - INT QUIT TSTP
135-
set start
136-
. $i
137-
)
138-
;;
139-
*)
140-
# No sh extension, so fork subprocess.
141-
$i start
142-
;;
143-
esac
136+
# Ignore dangling symlinks (if any).
137+
[ ! -f "$i" ] && continue
138+
139+
case "$i" in
140+
*.sh)
141+
# Source shell script for speed.
142+
(
143+
trap - INT QUIT TSTP
144+
set start
145+
. $i
146+
)
147+
;;
148+
*)
149+
# No sh extension, so fork subprocess.
150+
$i start
151+
;;
152+
esac
144153
done
145154

146155
# Asynchronous scripts without order
147156
#
148157
for i in /etc/init.d/A* ;do
149-
158+
150159
# Ignore dangling symlinks (if any).
151160
[ ! -f "$i" ] && continue
152161

OS/buildroot/overlay/lib/modules

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)