|
Line
Link Here
|
| 0 |
-- a/gen_cmdline.sh |
0 |
++ b/gen_cmdline.sh |
|
Lines 78-83
Link Here
|
| 78 |
echo " --evms Include EVMS support" |
78 |
echo " --evms Include EVMS support" |
| 79 |
echo " --> 'emerge evms' in the host operating system" |
79 |
echo " --> 'emerge evms' in the host operating system" |
| 80 |
echo " first" |
80 |
echo " first" |
|
|
81 |
echo " --suspend Include Suspend2 support" |
| 81 |
echo " --lvm Include LVM support" |
82 |
echo " --lvm Include LVM support" |
| 82 |
echo " --mdadm Include MDADM/MDMON support" |
83 |
echo " --mdadm Include MDADM/MDMON support" |
| 83 |
echo " --mdadm-config=<file> Use file as mdadm.conf in initramfs" |
84 |
echo " --mdadm-config=<file> Use file as mdadm.conf in initramfs" |
|
Lines 234-239
Link Here
|
| 234 |
echo |
235 |
echo |
| 235 |
print_warning 1 "Please use --evms, as --evms2 is deprecated." |
236 |
print_warning 1 "Please use --evms, as --evms2 is deprecated." |
| 236 |
;; |
237 |
;; |
|
|
238 |
--suspend) |
| 239 |
CMD_SUSPEND=1 |
| 240 |
print_info 2 "CMD_SUSPEND: ${CMD_SUSPEND}" |
| 241 |
;; |
| 237 |
--lvm) |
242 |
--lvm) |
| 238 |
CMD_LVM=1 |
243 |
CMD_LVM=1 |
| 239 |
print_info 2 "CMD_LVM: ${CMD_LVM}" |
244 |
print_info 2 "CMD_LVM: ${CMD_LVM}" |
| 240 |
-- a/gen_determineargs.sh |
245 |
++ b/gen_determineargs.sh |
|
Lines 107-112
Link Here
|
| 107 |
set_config_with_override 1 SYMLINK CMD_SYMLINK |
107 |
set_config_with_override 1 SYMLINK CMD_SYMLINK |
| 108 |
set_config_with_override 2 INSTALL_MOD_PATH CMD_INSTALL_MOD_PATH |
108 |
set_config_with_override 2 INSTALL_MOD_PATH CMD_INSTALL_MOD_PATH |
| 109 |
set_config_with_override 1 OLDCONFIG CMD_OLDCONFIG |
109 |
set_config_with_override 1 OLDCONFIG CMD_OLDCONFIG |
|
|
110 |
set_config_with_override 1 SUSPEND CMD_SUSPEND |
| 110 |
set_config_with_override 1 LVM CMD_LVM |
111 |
set_config_with_override 1 LVM CMD_LVM |
| 111 |
set_config_with_override 1 EVMS CMD_EVMS |
112 |
set_config_with_override 1 EVMS CMD_EVMS |
| 112 |
set_config_with_override 1 DMRAID CMD_DMRAID |
113 |
set_config_with_override 1 DMRAID CMD_DMRAID |
| 113 |
-- a/gen_initramfs.sh |
114 |
++ b/gen_initramfs.sh |
|
Lines 117-140
Link Here
|
| 117 |
rm -rf "${TEMP}/initramfs-unionfs-fuse-temp" > /dev/null |
117 |
rm -rf "${TEMP}/initramfs-unionfs-fuse-temp" > /dev/null |
| 118 |
} |
118 |
} |
| 119 |
|
119 |
|
| 120 |
#append_suspend(){ |
120 |
append_suspend(){ |
| 121 |
# if [ -d "${TEMP}/initramfs-suspend-temp" ]; |
121 |
if [ -d "${TEMP}/initramfs-suspend-temp" ]; |
| 122 |
# then |
122 |
then |
| 123 |
# rm -r "${TEMP}/initramfs-suspend-temp/" |
123 |
rm -r "${TEMP}/initramfs-suspend-temp/" |
| 124 |
# fi |
124 |
fi |
| 125 |
# print_info 1 'SUSPEND: Adding support (compiling binaries)...' |
125 |
print_info 1 ' Copying /etc/suspend.conf...' |
| 126 |
# compile_suspend |
126 |
mkdir -p "${TEMP}/initramfs-suspend-temp/etc" |
| 127 |
# mkdir -p "${TEMP}/initramfs-suspend-temp/" |
127 |
cp -f /etc/suspend.conf "${TEMP}/initramfs-suspend-temp/etc" || |
| 128 |
# /bin/tar -jxpf "${SUSPEND_BINCACHE}" -C "${TEMP}/initramfs-suspend-temp" || |
128 |
gen_die 'Could not copy /etc/suspend.conf' |
| 129 |
# gen_die "Could not extract suspend binary cache!" |
129 |
mkdir "${TEMP}/initramfs-suspend-temp/bin" |
| 130 |
# mkdir -p "${TEMP}/initramfs-suspend-temp/etc" |
130 |
print_info 1 ' Copying /usr/lib/suspend/resume...' |
| 131 |
# cp -f /etc/suspend.conf "${TEMP}/initramfs-suspend-temp/etc" || |
131 |
cp -f /usr/lib/suspend/resume "${TEMP}/initramfs-suspend-temp/bin" || |
| 132 |
# gen_die 'Could not copy /etc/suspend.conf' |
132 |
gen_die 'Could not copy /usr/lib/suspend/resume' |
| 133 |
# cd "${TEMP}/initramfs-suspend-temp/" |
133 |
cd "${TEMP}/initramfs-suspend-temp/" |
| 134 |
# find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \ |
134 |
find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \ |
| 135 |
# || gen_die "compressing suspend cpio" |
135 |
|| gen_die "compressing suspend cpio" |
| 136 |
# rm -r "${TEMP}/initramfs-suspend-temp/" |
136 |
rm -r "${TEMP}/initramfs-suspend-temp/" |
| 137 |
#} |
137 |
} |
| 138 |
|
138 |
|
| 139 |
append_multipath(){ |
139 |
append_multipath(){ |
| 140 |
if [ -d "${TEMP}/initramfs-multipath-temp" ] |
140 |
if [ -d "${TEMP}/initramfs-multipath-temp" ] |
|
Lines 674-679
Link Here
|
| 674 |
append_data 'auxilary' "${BUSYBOX}" |
674 |
append_data 'auxilary' "${BUSYBOX}" |
| 675 |
append_data 'busybox' "${BUSYBOX}" |
675 |
append_data 'busybox' "${BUSYBOX}" |
| 676 |
append_data 'lvm' "${LVM}" |
676 |
append_data 'lvm' "${LVM}" |
|
|
677 |
append_data 'suspend' "${SUSPEND}" |
| 677 |
append_data 'dmraid' "${DMRAID}" |
678 |
append_data 'dmraid' "${DMRAID}" |
| 678 |
append_data 'iscsi' "${ISCSI}" |
679 |
append_data 'iscsi' "${ISCSI}" |
| 679 |
append_data 'evms' "${EVMS}" |
680 |
append_data 'evms' "${EVMS}" |
| 680 |
-- a/defaults/initrd.scripts |
681 |
++ b/defaults/initrd.scripts |
|
Lines 1020-1026
Link Here
|
| 1020 |
swsusp_resume() { |
1020 |
swsusp_resume() { |
| 1021 |
# determine swap resume partition |
1021 |
# determine swap resume partition |
| 1022 |
local device=$(ls -lL "${REAL_RESUME}" | sed 's/\ */ /g' | cut -d \ -f 5-6 | sed 's/,\ */:/') |
1022 |
local device=$(ls -lL "${REAL_RESUME}" | sed 's/\ */ /g' | cut -d \ -f 5-6 | sed 's/,\ */:/') |
| 1023 |
[ -f /sys/power/resume ] && echo "${device}" > /sys/power/resume |
1023 |
if [ -f /sys/power/resume ]; then |
|
|
1024 |
which resume > /dev/null 2>&1 || return |
| 1025 |
local args |
| 1026 |
local features="$(resume --version | grep FEATURES)" |
| 1027 |
[ -n "${REAL_RESUME}" ] && args="${args} --resume_device=\"${REAL_RESUME}\"" |
| 1028 |
if ! grep suspend_noui /proc/cmdline > /dev/null 2>&1; then |
| 1029 |
echo "${features}" | grep "fbsplash" > /dev/null && grep "splash=" /proc/cmdline > /dev/null && args="${args} --parameter=\"splash=y\"" |
| 1030 |
fi |
| 1031 |
[ -c /dev/snapshot ] || mknod /dev/snapshot c 10 231 |
| 1032 |
eval resume ${args} -f /etc/suspend.conf |
| 1033 |
fi |
| 1024 |
} |
1034 |
} |
| 1025 |
|
1035 |
|
| 1026 |
tuxonice_resume() { |
1036 |
tuxonice_resume() { |
