projects
/
kernel-cn.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- u postinstu, ne pozivaj udevcontrol vec udevadm control
[kernel-cn.git]
/
debian
/
postinst
diff --git
a/debian/postinst
b/debian/postinst
index
fd8dbf6
..
547ddad
100755
(executable)
--- a/
debian/postinst
+++ b/
debian/postinst
@@
-109,8
+109,12
@@
echo -n " kernel-img.conf"
# generate initial grub loaders
if [ ! -d "$grub_dir" ]; then
mkdir -p "$grub_dir"
# generate initial grub loaders
if [ ! -d "$grub_dir" ]; then
mkdir -p "$grub_dir"
+ # x86
if [ -d /usr/lib/grub/i386-pc ]; then
cp -a /usr/lib/grub/i386-pc/* "$grub_dir"
if [ -d /usr/lib/grub/i386-pc ]; then
cp -a /usr/lib/grub/i386-pc/* "$grub_dir"
+ # x86_64
+ elif [ -d /usr/lib/grub/x86_64-pc ]; then
+ cp -a /usr/lib/grub/x86_64-pc/* "$grub_dir"
fi
fi
echo -n " grub1"
fi
fi
echo -n " grub1"
@@
-143,7
+147,7
@@
echo -n " grub3"
# workaround execshield
SHIELD=$(sysctl -e -n kernel.exec-shield)
if [ ! -z "$SHIELD" ]; then
# workaround execshield
SHIELD=$(sysctl -e -n kernel.exec-shield)
if [ ! -z "$SHIELD" ]; then
- sysctl -w -e kernel.exec-shield=0 >/dev/null 2>&1
+ sysctl -e -w kernel.exec-shield=0 >/dev/null 2>&1
echo -n " execshield1"
fi
echo -n " execshield1"
fi
@@
-153,7
+157,7
@@
rm -f /etc/udev/rules.d/devfs.rules /etc/udev/rules.d/compat.rules \
#if [ ! -e /etc/udev/rules.d/udev.rules ]; then
# ln -s ../udev.rules /etc/udev/rules.d/udev.rules
#fi
#if [ ! -e /etc/udev/rules.d/udev.rules ]; then
# ln -s ../udev.rules /etc/udev/rules.d/udev.rules
#fi
-udevcontrol reload_rules >/dev/null 2>&1 || true
+udevadm control --reload_rules >/dev/null 2>&1 || true
udevsettle || true
echo -n " udev"
udevsettle || true
echo -n " udev"
@@
-246,7
+250,7
@@
echo -n " grub8"
# restore execshield state
if [ ! -z "$SHIELD" ]; then
# restore execshield state
if [ ! -z "$SHIELD" ]; then
- sysctl -w -e "kernel.exec-shield=$SHIELD" >/dev/null 2>&1
+ sysctl -e -w "kernel.exec-shield=$SHIELD" >/dev/null 2>&1
echo -n " execshield2"
fi
echo -n " execshield2"
fi