| 1 |
commit: bf0cad6a30b2344a3abb6cbeb805b27ba7708c96 |
| 2 |
Author: Sebastian Pipping <sebastian <AT> pipping <DOT> org> |
| 3 |
AuthorDate: Sun Jul 3 18:56:05 2011 +0000 |
| 4 |
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jul 3 18:57:08 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=bf0cad6a |
| 7 |
|
| 8 |
Remove support for sys-fs/evms, as it was removed from Gentoo (bug #372423) |
| 9 |
|
| 10 |
--- |
| 11 |
ChangeLog | 11 +++++++++ |
| 12 |
arch/alpha/modules_load | 1 - |
| 13 |
arch/arm/modules_load | 1 - |
| 14 |
arch/ia64/modules_load | 1 - |
| 15 |
arch/mips/modules_load | 1 - |
| 16 |
arch/parisc/modules_load | 1 - |
| 17 |
arch/parisc64/modules_load | 1 - |
| 18 |
arch/ppc/modules_load | 1 - |
| 19 |
arch/ppc64/modules_load | 1 - |
| 20 |
arch/sparc/modules_load | 1 - |
| 21 |
arch/sparc64/modules_load | 1 - |
| 22 |
arch/um/modules_load | 1 - |
| 23 |
arch/x86/modules_load | 1 - |
| 24 |
arch/x86_64/modules_load | 1 - |
| 25 |
defaults/initrd.defaults | 2 +- |
| 26 |
defaults/initrd.scripts | 18 -------------- |
| 27 |
defaults/linuxrc | 7 ----- |
| 28 |
defaults/modules_load | 1 - |
| 29 |
doc/genkernel.8.txt | 7 ----- |
| 30 |
gen_cmdline.sh | 13 ---------- |
| 31 |
gen_determineargs.sh | 1 - |
| 32 |
gen_initramfs.sh | 54 -------------------------------------------- |
| 33 |
genkernel | 1 - |
| 34 |
genkernel.conf | 4 --- |
| 35 |
maintenance/docmatcher.py | 2 +- |
| 36 |
25 files changed, 13 insertions(+), 121 deletions(-) |
| 37 |
|
| 38 |
diff --git a/ChangeLog b/ChangeLog |
| 39 |
index 80850ae..862e001 100644 |
| 40 |
--- a/ChangeLog |
| 41 |
+++ b/ChangeLog |
| 42 |
@@ -5,6 +5,17 @@ |
| 43 |
# Distributed under the GPL v2 |
| 44 |
# $Id$ |
| 45 |
|
| 46 |
+ 03 Jul 2011; Sebastian Pipping <sping@g.o> arch/alpha/modules_load, |
| 47 |
+ arch/arm/modules_load, arch/ia64/modules_load, arch/mips/modules_load, |
| 48 |
+ arch/parisc/modules_load, arch/parisc64/modules_load, arch/ppc/modules_load, |
| 49 |
+ arch/ppc64/modules_load, arch/sparc/modules_load, arch/sparc64/modules_load, |
| 50 |
+ arch/um/modules_load, arch/x86/modules_load, arch/x86_64/modules_load, |
| 51 |
+ defaults/initrd.defaults, defaults/initrd.scripts, defaults/linuxrc, |
| 52 |
+ defaults/modules_load, doc/genkernel.8.txt, gen_cmdline.sh, |
| 53 |
+ gen_determineargs.sh, gen_initramfs.sh, genkernel, genkernel.conf, |
| 54 |
+ maintenance/docmatcher.py: |
| 55 |
+ Remove support for sys-fs/evms, as it was removed from Gentoo (bug #372423) |
| 56 |
+ |
| 57 |
22 Jun 2011; Sebastian Pipping <sping@g.o> gen_compile.sh: |
| 58 |
Make --arch-override= affect "make menuconfig" (bug #247246) |
| 59 |
|
| 60 |
|
| 61 |
diff --git a/arch/alpha/modules_load b/arch/alpha/modules_load |
| 62 |
index faf099d..731dbf4 100644 |
| 63 |
--- a/arch/alpha/modules_load |
| 64 |
+++ b/arch/alpha/modules_load |
| 65 |
@@ -3,7 +3,6 @@ |
| 66 |
# RAID |
| 67 |
MODULES_ATARAID="ataraid pdcraid hptraid" |
| 68 |
MODULES_DMRAID="dm-mod dm-mirror" |
| 69 |
-MODULES_EVMS="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10" |
| 70 |
MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr" |
| 71 |
MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10" |
| 72 |
|
| 73 |
|
| 74 |
diff --git a/arch/arm/modules_load b/arch/arm/modules_load |
| 75 |
index cd14951..4b43271 100644 |
| 76 |
--- a/arch/arm/modules_load |
| 77 |
+++ b/arch/arm/modules_load |
| 78 |
@@ -3,7 +3,6 @@ |
| 79 |
# RAID |
| 80 |
MODULES_ATARAID="ataraid pdcraid hptraid" |
| 81 |
MODULES_DMRAID="dm-mod dm-mirror" |
| 82 |
-MODULES_EVMS="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10" |
| 83 |
MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr" |
| 84 |
MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10" |
| 85 |
|
| 86 |
|
| 87 |
diff --git a/arch/ia64/modules_load b/arch/ia64/modules_load |
| 88 |
index 51bdc14..b323538 100644 |
| 89 |
--- a/arch/ia64/modules_load |
| 90 |
+++ b/arch/ia64/modules_load |
| 91 |
@@ -3,7 +3,6 @@ |
| 92 |
# RAID |
| 93 |
MODULES_ATARAID="ataraid pdcraid hptraid" |
| 94 |
MODULES_DMRAID="dm-mod dm-mirror" |
| 95 |
-MODULES_EVMS="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10" |
| 96 |
MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr" |
| 97 |
MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10" |
| 98 |
|
| 99 |
|
| 100 |
diff --git a/arch/mips/modules_load b/arch/mips/modules_load |
| 101 |
index faf099d..731dbf4 100644 |
| 102 |
--- a/arch/mips/modules_load |
| 103 |
+++ b/arch/mips/modules_load |
| 104 |
@@ -3,7 +3,6 @@ |
| 105 |
# RAID |
| 106 |
MODULES_ATARAID="ataraid pdcraid hptraid" |
| 107 |
MODULES_DMRAID="dm-mod dm-mirror" |
| 108 |
-MODULES_EVMS="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10" |
| 109 |
MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr" |
| 110 |
MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10" |
| 111 |
|
| 112 |
|
| 113 |
diff --git a/arch/parisc/modules_load b/arch/parisc/modules_load |
| 114 |
index faf099d..731dbf4 100644 |
| 115 |
--- a/arch/parisc/modules_load |
| 116 |
+++ b/arch/parisc/modules_load |
| 117 |
@@ -3,7 +3,6 @@ |
| 118 |
# RAID |
| 119 |
MODULES_ATARAID="ataraid pdcraid hptraid" |
| 120 |
MODULES_DMRAID="dm-mod dm-mirror" |
| 121 |
-MODULES_EVMS="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10" |
| 122 |
MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr" |
| 123 |
MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10" |
| 124 |
|
| 125 |
|
| 126 |
diff --git a/arch/parisc64/modules_load b/arch/parisc64/modules_load |
| 127 |
index 51bdc14..b323538 100644 |
| 128 |
--- a/arch/parisc64/modules_load |
| 129 |
+++ b/arch/parisc64/modules_load |
| 130 |
@@ -3,7 +3,6 @@ |
| 131 |
# RAID |
| 132 |
MODULES_ATARAID="ataraid pdcraid hptraid" |
| 133 |
MODULES_DMRAID="dm-mod dm-mirror" |
| 134 |
-MODULES_EVMS="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10" |
| 135 |
MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr" |
| 136 |
MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10" |
| 137 |
|
| 138 |
|
| 139 |
diff --git a/arch/ppc/modules_load b/arch/ppc/modules_load |
| 140 |
index faf099d..731dbf4 100644 |
| 141 |
--- a/arch/ppc/modules_load |
| 142 |
+++ b/arch/ppc/modules_load |
| 143 |
@@ -3,7 +3,6 @@ |
| 144 |
# RAID |
| 145 |
MODULES_ATARAID="ataraid pdcraid hptraid" |
| 146 |
MODULES_DMRAID="dm-mod dm-mirror" |
| 147 |
-MODULES_EVMS="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10" |
| 148 |
MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr" |
| 149 |
MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10" |
| 150 |
|
| 151 |
|
| 152 |
diff --git a/arch/ppc64/modules_load b/arch/ppc64/modules_load |
| 153 |
index 51bdc14..b323538 100644 |
| 154 |
--- a/arch/ppc64/modules_load |
| 155 |
+++ b/arch/ppc64/modules_load |
| 156 |
@@ -3,7 +3,6 @@ |
| 157 |
# RAID |
| 158 |
MODULES_ATARAID="ataraid pdcraid hptraid" |
| 159 |
MODULES_DMRAID="dm-mod dm-mirror" |
| 160 |
-MODULES_EVMS="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10" |
| 161 |
MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr" |
| 162 |
MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10" |
| 163 |
|
| 164 |
|
| 165 |
diff --git a/arch/sparc/modules_load b/arch/sparc/modules_load |
| 166 |
index faf099d..731dbf4 100644 |
| 167 |
--- a/arch/sparc/modules_load |
| 168 |
+++ b/arch/sparc/modules_load |
| 169 |
@@ -3,7 +3,6 @@ |
| 170 |
# RAID |
| 171 |
MODULES_ATARAID="ataraid pdcraid hptraid" |
| 172 |
MODULES_DMRAID="dm-mod dm-mirror" |
| 173 |
-MODULES_EVMS="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10" |
| 174 |
MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr" |
| 175 |
MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10" |
| 176 |
|
| 177 |
|
| 178 |
diff --git a/arch/sparc64/modules_load b/arch/sparc64/modules_load |
| 179 |
index 51bdc14..b323538 100644 |
| 180 |
--- a/arch/sparc64/modules_load |
| 181 |
+++ b/arch/sparc64/modules_load |
| 182 |
@@ -3,7 +3,6 @@ |
| 183 |
# RAID |
| 184 |
MODULES_ATARAID="ataraid pdcraid hptraid" |
| 185 |
MODULES_DMRAID="dm-mod dm-mirror" |
| 186 |
-MODULES_EVMS="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10" |
| 187 |
MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr" |
| 188 |
MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10" |
| 189 |
|
| 190 |
|
| 191 |
diff --git a/arch/um/modules_load b/arch/um/modules_load |
| 192 |
index dfe4431..625a304 100644 |
| 193 |
--- a/arch/um/modules_load |
| 194 |
+++ b/arch/um/modules_load |
| 195 |
@@ -3,7 +3,6 @@ |
| 196 |
# RAID |
| 197 |
MODULES_ATARAID="ataraid pdcraid hptraid" |
| 198 |
MODULES_DMRAID="dm-mod dm-mirror" |
| 199 |
-MODULES_EVMS="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10" |
| 200 |
MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr" |
| 201 |
MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10" |
| 202 |
|
| 203 |
|
| 204 |
diff --git a/arch/x86/modules_load b/arch/x86/modules_load |
| 205 |
index 84ec83e..b7936bf 100644 |
| 206 |
--- a/arch/x86/modules_load |
| 207 |
+++ b/arch/x86/modules_load |
| 208 |
@@ -4,7 +4,6 @@ |
| 209 |
# RAID |
| 210 |
MODULES_ATARAID="ataraid pdcraid hptraid" |
| 211 |
MODULES_DMRAID="dm-mod dm-mirror dm-crypt" |
| 212 |
-MODULES_EVMS="dm-mod dm-snapshot dm-mirror dm-crypt dm-bbr raid0 raid1 raid456 raid5 raid6 raid10" |
| 213 |
MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-crypt dm-bbr" |
| 214 |
MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-crypt dm-bbr raid0 raid1 raid456 raid5 raid6 raid10" |
| 215 |
|
| 216 |
|
| 217 |
diff --git a/arch/x86_64/modules_load b/arch/x86_64/modules_load |
| 218 |
index d553165..8bae053 100644 |
| 219 |
--- a/arch/x86_64/modules_load |
| 220 |
+++ b/arch/x86_64/modules_load |
| 221 |
@@ -3,7 +3,6 @@ |
| 222 |
# RAID |
| 223 |
MODULES_ATARAID="ataraid pdcraid hptraid" |
| 224 |
MODULES_DMRAID="dm-mod dm-mirror dm-crypt" |
| 225 |
-MODULES_EVMS="dm-mod dm-snapshot dm-mirror dm-crypt dm-bbr raid0 raid1 raid456 raid5 raid6 raid10" |
| 226 |
MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-crypt dm-bbr" |
| 227 |
MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-crypt dm-bbr raid0 raid1 raid456 raid5 raid6 raid10" |
| 228 |
|
| 229 |
|
| 230 |
diff --git a/defaults/initrd.defaults b/defaults/initrd.defaults |
| 231 |
index 72e8376..76d72a7 100755 |
| 232 |
--- a/defaults/initrd.defaults |
| 233 |
+++ b/defaults/initrd.defaults |
| 234 |
@@ -79,5 +79,5 @@ DEFAULT_NFSOPTIONS="ro,nolock,rsize=1024,wsize=1024" |
| 235 |
|
| 236 |
# Only sections that are in by default or those that |
| 237 |
# are not module groups need to be defined here... |
| 238 |
-HWOPTS='keymap cache modules pata sata scsi usb firewire waitscan slowusb evms lvm dmraid mdadm fs net' |
| 239 |
+HWOPTS='keymap cache modules pata sata scsi usb firewire waitscan slowusb lvm dmraid mdadm fs net' |
| 240 |
MY_HWOPTS='modules pata sata scsi slowusb usb firewire waitscan dmraid mdadm fs net iscsi' |
| 241 |
|
| 242 |
diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts |
| 243 |
index 37a7eb4..b908ba0 100755 |
| 244 |
--- a/defaults/initrd.scripts |
| 245 |
+++ b/defaults/initrd.scripts |
| 246 |
@@ -660,28 +660,10 @@ startVolumes() { |
| 247 |
# And finally execute it all (/proc/... needed if lvm is compiled without readline) |
| 248 |
good_msg "Scanning for and activating Volume Groups" |
| 249 |
printf "%b\n" "${lvm_commands}" | /bin/lvm /proc/self/fd/0 |
| 250 |
- |
| 251 |
- # Disable EVMS since lvm is activated and they dont work together. |
| 252 |
- if [ "${USE_EVMS_NORMAL}" = '1' ] |
| 253 |
- then |
| 254 |
- bad_msg "Disabling EVMS Support because LVM started" |
| 255 |
- bad_msg "Do not add dolvm to the cmdline if this is not what you want" |
| 256 |
- bad_msg "LVM and EVMS do not work well together" |
| 257 |
- USE_EVMS_NORMAL=0 |
| 258 |
- fi |
| 259 |
else |
| 260 |
bad_msg "vgscan or vgchange not found: skipping LVM volume group activation!" |
| 261 |
fi |
| 262 |
fi |
| 263 |
- |
| 264 |
- if [ "${USE_EVMS_NORMAL}" = '1' ] |
| 265 |
- then |
| 266 |
- if [ -e '/sbin/evms_activate' ] |
| 267 |
- then |
| 268 |
- good_msg "Activating EVMS" |
| 269 |
- evms_activate |
| 270 |
- fi |
| 271 |
- fi |
| 272 |
} |
| 273 |
|
| 274 |
startiscsi() { |
| 275 |
|
| 276 |
diff --git a/defaults/linuxrc b/defaults/linuxrc |
| 277 |
index 57f26fd..0843f5d 100755 |
| 278 |
--- a/defaults/linuxrc |
| 279 |
+++ b/defaults/linuxrc |
| 280 |
@@ -96,13 +96,6 @@ do |
| 281 |
DMRAID_OPTS=`parse_opt "${x}"` |
| 282 |
USE_DMRAID_NORMAL=1 |
| 283 |
;; |
| 284 |
- doevms) |
| 285 |
- USE_EVMS_NORMAL=1 |
| 286 |
- ;; |
| 287 |
- doevms2) |
| 288 |
- bad_msg 'Using doevms2 is deprecated, use doevms, instead.' |
| 289 |
- USE_EVMS_NORMAL=1 |
| 290 |
- ;; |
| 291 |
# Debug Options |
| 292 |
debug) |
| 293 |
DEBUG='yes' |
| 294 |
|
| 295 |
diff --git a/defaults/modules_load b/defaults/modules_load |
| 296 |
index 31f534b..269a40c 100644 |
| 297 |
--- a/defaults/modules_load |
| 298 |
+++ b/defaults/modules_load |
| 299 |
@@ -3,7 +3,6 @@ |
| 300 |
# RAID |
| 301 |
MODULES_ATARAID="ataraid pdcraid hptraid" |
| 302 |
MODULES_DMRAID="dm-mod dm-mirror" |
| 303 |
-MODULES_EVMS="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10" |
| 304 |
MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr" |
| 305 |
MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10" |
| 306 |
|
| 307 |
|
| 308 |
diff --git a/doc/genkernel.8.txt b/doc/genkernel.8.txt |
| 309 |
index 54cb411..2d7f775 100644 |
| 310 |
--- a/doc/genkernel.8.txt |
| 311 |
+++ b/doc/genkernel.8.txt |
| 312 |
@@ -236,10 +236,6 @@ INITIALIZATION |
| 313 |
*--no-keymap*:: |
| 314 |
Disables keymap selection at boot. |
| 315 |
|
| 316 |
-*--evms*:: |
| 317 |
- Add in EVMS support from static binaries if they exist on the system: |
| 318 |
- you should run "emerge evms" first (in the host system). |
| 319 |
- |
| 320 |
*--lvm*:: |
| 321 |
Add in LVM support from static binaries if they exist on the |
| 322 |
system, or compile static LVM binaries if static ones do not |
| 323 |
@@ -417,9 +413,6 @@ which the ramdisk scripts would recognize. |
| 324 |
location. Otherwise the location will be deduced from the DCHP |
| 325 |
request (option root-path) |
| 326 |
|
| 327 |
-*doevms*:: |
| 328 |
- Activate EVMS volumes on bootup |
| 329 |
- |
| 330 |
*dolvm*:: |
| 331 |
Activate LVM volumes on bootup |
| 332 |
|
| 333 |
|
| 334 |
diff --git a/gen_cmdline.sh b/gen_cmdline.sh |
| 335 |
index 9e4009e..f7eb707 100755 |
| 336 |
--- a/gen_cmdline.sh |
| 337 |
+++ b/gen_cmdline.sh |
| 338 |
@@ -75,9 +75,6 @@ longusage() { |
| 339 |
echo " --splash-res=<res> Select splash theme resolutions to install" |
| 340 |
echo " --do-keymap-auto Forces keymap selection at boot" |
| 341 |
echo " --no-keymap Disables keymap selection support" |
| 342 |
- echo " --evms Include EVMS support" |
| 343 |
- echo " --> 'emerge evms' in the host operating system" |
| 344 |
- echo " first" |
| 345 |
echo " --lvm Include LVM support" |
| 346 |
echo " --mdadm Include MDADM/MDMON support" |
| 347 |
echo " --mdadm-config=<file> Use file as mdadm.conf in initramfs" |
| 348 |
@@ -224,16 +221,6 @@ parse_cmdline() { |
| 349 |
CMD_KEYMAP=0 |
| 350 |
print_info 2 "CMD_KEYMAP: ${CMD_KEYMAP}" |
| 351 |
;; |
| 352 |
- --evms) |
| 353 |
- CMD_EVMS=1 |
| 354 |
- print_info 2 "CMD_EVMS: ${CMD_EVMS}" |
| 355 |
- ;; |
| 356 |
- --evms2) |
| 357 |
- CMD_EVMS=1 |
| 358 |
- print_info 2 "CMD_EVMS: ${CMD_EVMS}" |
| 359 |
- echo |
| 360 |
- print_warning 1 "Please use --evms, as --evms2 is deprecated." |
| 361 |
- ;; |
| 362 |
--lvm) |
| 363 |
CMD_LVM=1 |
| 364 |
print_info 2 "CMD_LVM: ${CMD_LVM}" |
| 365 |
|
| 366 |
diff --git a/gen_determineargs.sh b/gen_determineargs.sh |
| 367 |
index 6f88805..ce479cb 100755 |
| 368 |
--- a/gen_determineargs.sh |
| 369 |
+++ b/gen_determineargs.sh |
| 370 |
@@ -108,7 +108,6 @@ determine_real_args() { |
| 371 |
set_config_with_override STRING INSTALL_MOD_PATH CMD_INSTALL_MOD_PATH |
| 372 |
set_config_with_override BOOL OLDCONFIG CMD_OLDCONFIG |
| 373 |
set_config_with_override BOOL LVM CMD_LVM |
| 374 |
- set_config_with_override BOOL EVMS CMD_EVMS |
| 375 |
set_config_with_override BOOL DMRAID CMD_DMRAID |
| 376 |
set_config_with_override BOOL ISCSI CMD_ISCSI |
| 377 |
set_config_with_override BOOL BUSYBOX CMD_BUSYBOX "yes" |
| 378 |
|
| 379 |
diff --git a/gen_initramfs.sh b/gen_initramfs.sh |
| 380 |
index 543f484..7fe4421 100755 |
| 381 |
--- a/gen_initramfs.sh |
| 382 |
+++ b/gen_initramfs.sh |
| 383 |
@@ -279,59 +279,6 @@ append_lvm(){ |
| 384 |
rm -r "${TEMP}/initramfs-lvm-temp/" |
| 385 |
} |
| 386 |
|
| 387 |
-append_evms(){ |
| 388 |
- if [ -d "${TEMP}/initramfs-evms-temp" ] |
| 389 |
- then |
| 390 |
- rm -r "${TEMP}/initramfs-evms-temp/" |
| 391 |
- fi |
| 392 |
- mkdir -p "${TEMP}/initramfs-evms-temp/lib/evms" |
| 393 |
- mkdir -p "${TEMP}/initramfs-evms-temp/etc/" |
| 394 |
- mkdir -p "${TEMP}/initramfs-evms-temp/bin/" |
| 395 |
- mkdir -p "${TEMP}/initramfs-evms-temp/sbin/" |
| 396 |
- if [ "${EVMS}" = '1' ] |
| 397 |
- then |
| 398 |
- print_info 1 ' EVMS: Adding support...' |
| 399 |
- mkdir -p ${TEMP}/initramfs-evms-temp/lib |
| 400 |
- cp -a /lib/ld-* "${TEMP}/initramfs-evms-temp/lib" \ |
| 401 |
- || gen_die 'Could not copy files for EVMS!' |
| 402 |
- if [ -n "`ls /lib/libgcc_s*`" ] |
| 403 |
- then |
| 404 |
- cp -a /lib/libgcc_s* "${TEMP}/initramfs-evms-temp/lib" \ |
| 405 |
- || gen_die 'Could not copy files for EVMS!' |
| 406 |
- fi |
| 407 |
- cp -a /lib/libc-* /lib/libc.* "${TEMP}/initramfs-evms-temp/lib" \ |
| 408 |
- || gen_die 'Could not copy files for EVMS!' |
| 409 |
- cp -a /lib/libdl-* /lib/libdl.* "${TEMP}/initramfs-evms-temp/lib" \ |
| 410 |
- || gen_die 'Could not copy files for EVMS!' |
| 411 |
- cp -a /lib/libpthread* "${TEMP}/initramfs-evms-temp/lib" \ |
| 412 |
- || gen_die 'Could not copy files for EVMS!' |
| 413 |
- cp -a /lib/libuuid*so* "${TEMP}/initramfs-evms-temp/lib" \ |
| 414 |
- || gen_die 'Could not copy files for EVMS!' |
| 415 |
- cp -a /lib/libevms*so* "${TEMP}/initramfs-evms-temp/lib" \ |
| 416 |
- || gen_die 'Could not copy files for EVMS!' |
| 417 |
- cp -a /lib/evms "${TEMP}/initramfs-evms-temp/lib" \ |
| 418 |
- || gen_die 'Could not copy files for EVMS!' |
| 419 |
- cp -a /lib/evms/* "${TEMP}/initramfs-evms-temp/lib/evms" \ |
| 420 |
- || gen_die 'Could not copy files for EVMS!' |
| 421 |
- cp -a /etc/evms.conf "${TEMP}/initramfs-evms-temp/etc" \ |
| 422 |
- || gen_die 'Could not copy files for EVMS!' |
| 423 |
- cp /sbin/evms_activate "${TEMP}/initramfs-evms-temp/sbin" \ |
| 424 |
- || gen_die 'Could not copy over evms_activate!' |
| 425 |
- |
| 426 |
- # Fix EVMS complaining that it can't find the swap utilities. |
| 427 |
- # These are not required in the initramfs |
| 428 |
- for swap_libs in "${TEMP}/initramfs-evms-temp/lib/evms/*/swap*.so" |
| 429 |
- do |
| 430 |
- rm ${swap_libs} |
| 431 |
- done |
| 432 |
- fi |
| 433 |
- cd "${TEMP}/initramfs-evms-temp/" |
| 434 |
- find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \ |
| 435 |
- || gen_die "compressing evms cpio" |
| 436 |
- cd "${TEMP}" |
| 437 |
- rm -r "${TEMP}/initramfs-evms-temp/" |
| 438 |
-} |
| 439 |
- |
| 440 |
append_mdadm(){ |
| 441 |
if [ -d "${TEMP}/initramfs-mdadm-temp" ] |
| 442 |
then |
| 443 |
@@ -676,7 +623,6 @@ create_initramfs() { |
| 444 |
append_data 'lvm' "${LVM}" |
| 445 |
append_data 'dmraid' "${DMRAID}" |
| 446 |
append_data 'iscsi' "${ISCSI}" |
| 447 |
- append_data 'evms' "${EVMS}" |
| 448 |
append_data 'mdadm' "${MDADM}" |
| 449 |
append_data 'luks' "${LUKS}" |
| 450 |
append_data 'multipath' "${MULTIPATH}" |
| 451 |
|
| 452 |
diff --git a/genkernel b/genkernel |
| 453 |
index f72cf43..38e445f 100755 |
| 454 |
--- a/genkernel |
| 455 |
+++ b/genkernel |
| 456 |
@@ -348,7 +348,6 @@ then |
| 457 |
print_warning 1 'Additional kernel cmdline arguments that *may* be required to boot properly...' |
| 458 |
[ "${SPLASH}" = '1' ] && print_warning 1 "add \"vga=791 splash=silent,theme:${SPLASH_THEME} console=tty1 quiet\" if you use a splash framebuffer ]" |
| 459 |
[ "${LVM}" = '1' ] && print_warning 1 'add "dolvm" for lvm support' |
| 460 |
- [ "${EVMS}" = '1' ] && print_warning 1 'add "doevms" for evms support' |
| 461 |
[ "${DMRAID}" = '1' ] && print_warning 1 'add "dodmraid" for dmraid support' |
| 462 |
[ "${MDADM}" = '1' ] && print_warning 1 'add "domdadm" for RAID support' |
| 463 |
[ "${DMRAID}" = '1' ] && print_warning 1 ' or "dodmraid=<additional options>"' |
| 464 |
|
| 465 |
diff --git a/genkernel.conf b/genkernel.conf |
| 466 |
index 420eb93..24fcd54 100644 |
| 467 |
--- a/genkernel.conf |
| 468 |
+++ b/genkernel.conf |
| 469 |
@@ -62,10 +62,6 @@ USECOLOR="yes" |
| 470 |
# Add in GnuPG support |
| 471 |
# GPG="no" |
| 472 |
|
| 473 |
-# Add in EVMS support from static binaries if they exist on the system: you |
| 474 |
-# should run "emerge evms" first. |
| 475 |
-# EVMS="no" |
| 476 |
- |
| 477 |
# Add DMRAID support. |
| 478 |
# DMRAID="no" |
| 479 |
|
| 480 |
|
| 481 |
diff --git a/maintenance/docmatcher.py b/maintenance/docmatcher.py |
| 482 |
index 848774a..6ba2cf9 100644 |
| 483 |
--- a/maintenance/docmatcher.py |
| 484 |
+++ b/maintenance/docmatcher.py |
| 485 |
@@ -27,7 +27,7 @@ EXTRA_VARIABLES = tuple(EXTRA_VARIABLES) |
| 486 |
IGNORE_OPTIONS = ('help', 'version') |
| 487 |
_GPG_PARAMETERS = ('symmetric', ) |
| 488 |
IGNORE_PARAMETERS = _GPG_PARAMETERS |
| 489 |
-DEPRECATED_PARAMETERS = ('lvm2', 'evms2', 'gensplash', 'gensplash-res') |
| 490 |
+DEPRECATED_PARAMETERS = ('lvm2', 'gensplash', 'gensplash-res') |
| 491 |
|
| 492 |
|
| 493 |
def exract_gen_cmdline_sh(): |
Archives