From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Message-ID: <44FC1281.8000107@solin.spb.ru> Date: Mon, 04 Sep 2006 15:48:17 +0400 From: Aleksey Avdeev User-Agent: Mozilla Thunderbird 1.0.6 (X11/20050815) X-Accept-Language: ru-ru, ru MIME-Version: 1.0 To: ALT Linux Sisyphus discussion list References: <440BE52A.3020102@ats-manager.stc.donpac.ru> <20060306082641.GR30276@osdn.org.ua> <44F456DB.4010907@solin.spb.ru> <44F45D0D.4070609@solin.spb.ru> <44F4F1DC.7050500@solin.spb.ru> In-Reply-To: <44F4F1DC.7050500@solin.spb.ru> X-Enigmail-Version: 0.93.0.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="------------enig7AE40D15CEEA066E96008C63" Cc: ALT Devel discussion list Subject: Re: [sisyphus] =?koi8-r?b?aW5pdHJkIMTM0SDQz8TO0dTJ0SBFVk1TIChwYXRo?= =?koi8-r?b?IM7BIG1raW5pdHJkKQ==?= X-BeenThere: sisyphus@lists.altlinux.org X-Mailman-Version: 2.1.7 Precedence: list Reply-To: ALT Linux Sisyphus discussion list List-Id: ALT Linux Sisyphus discussion list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Sep 2006 11:48:26 -0000 Archived-At: List-Archive: List-Post: This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enig7AE40D15CEEA066E96008C63 Content-Type: multipart/mixed; boundary="------------020907030805080606070907" This is a multi-part message in MIME format. --------------020907030805080606070907 Content-Type: text/plain; charset=KOI8-R Content-Transfer-Encoding: quoted-printable Aleksey Avdeev =D0=C9=DB=C5=D4: > Aleksey Avdeev =D0=C9=DB=C5=D4: >=20 >>Aleksey Avdeev =D0=C9=DB=C5=D4: >> >> >>>Michael Shigorin =D0=C9=DB=C5=D4: >>> >>> >>> >>>>=E4=CC=D1 =CB=CF=D2=CE=D1 =C7=CF=C4-=C4=D7=C1 =D4=CF=CD=D5 =CE=C1=C4=CF= =C2=D9=CC=CF =CE=C5=D3=CB=CF=CC=D8=CB=CF =D0=C5=D2=C5=CB=CF=D7=D9=D2=D1=CE= =CE=D9=CA initrd >>>>=C4=C5=CC=C1=D4=D8 =C9 =C5=D3=D4=D8 =D7=C5=D3=D8=CD=C1 =D3=C9=CC=D8=CE= =CF=C5 =CD=CE=C5=CE=C9=C5, =DE=D4=CF =C4=CC=D1 =CF=C2=D9=DE=CE=D9=C8 =D3=CC= =D5=DE=C1=C5=D7 =DC=D4=CF=20 >>>>=CE=C5=CF=D0=D2=C1=D7=C4=C1=CE=CE=CF (=CC=D5=DE=DB=C5 =D3=C4=C5=CC=C1= =D4=D8 =C5=C7=CF =CE=C1 RAID1). >>> >>> >>> =E5=D3=D4=D8 =CC=C9 =D3=D3=D9=CC=CB=C9 =CE=C1 =C9=CE=C6=CF=D2=CD=C1=C3= =C9=C0 =CF=C2 =DC=D4=CF=CD (=C9=CE=D4=C5=D2=C5=D3=D5=C0=D4 =C4=CF=D2=C1=C2= =CF=D4=CB=C9 >>>=F3=C9=DA=C9=C6=CF=D7=D3=CB=CF=C7=CF initrd)? >> >> >> =EE=C1 =C4=C1=CE=CE=D9=CA =CD=CF=CD=C5=CE=D4 -- =CE=C1=DB=A3=CC >> >=20 >=20 > =F4=CF =DE=D4=CF =D5 =CD=C5=CE=D1 =D0=CF=CC=D5=DE=C9=CC=CF=D3=D8 -- =CF= =D0=C9=D3=C1=CC =DA=C4=C5=D3=D8: > =F3=C4=C5=CC=C1=CC =CE=C5=C2=CF=CC=D8=DB=CF=CA patch =CE=C1 mkinitrd (V= ERSION=3D2.9.9), =C4=CF=C2=C1=D7=CC=D1=C0=DD=C9=CA =C4=C1=CE=CE=D5=C0 =C6=D5=CE=CB=C3=C9=CF=CE=C1=CC=D8=CE=CF=D3=D4=D8. =F7 mkinitrd =C4=CF=C2=C1=D7=CC=C5=CE =D0=C1=D2=C1=CD=C5=D4=D2 --with-e= vms. =E5=D3=CC=C9 =C5=C7=CF =CE=C5 =D5=CB=C1=DA=D9=D7=C1=D4=D8 -- =C7=C5=CE=C5=D2=C1=C3=C9=D1 initrd =D3=CF=D7=D0=C1=C4=C1=C5=D4 =D3=CF =D3= =D4=C1=CE=C4=C1=D2=D4=CE=CF=CA. =E5=D3=CC=C9 =D5=CB=C1=DA=C1=D4=D8, =D4=CF= =D0=D2=CF=C9=DA=CF=CA=C4=A3=D4 =D3=CC=C5=C4=D5=C0=DD=C9=C5: 1. =F7 initrd =C2=D5=C4=C5=D4 =C4=CF=C2=C1=D7=CC=C5=CE=C1 /sbin/evms_acti= vate (=D3=CF =D7=D3=C5=CD=C9 =D4=D2=C5=C2=D5=C5=CD=D9=CD=C9 =C2=C9=C2=CC=C9=CF=D4=C5=CB=C1=CD=C9); 2. =F4=C1=CB=D6=C5, =C2=D5=C4=D5=D4 =C4=CF=C2=C1=D7=CC=C5=CE=D9 evms =D0=CC= =CF=C7=C9=CE=D9 =C9=DA =D3=D0=C9=D3=CB=C1: aix, bbr, bsd, disk, dos, drivelink, gpt, lvm*, md, os2, s390 =C9/=C9=CC=C9 snapshot (=D4=CF=DE= =CE=C5=C5 -- =D4=C5 =C9=DA =CE=C9=C8, =CB=CF=D4=CF=D2=D9=C5 =D0=D2=C9=D3=D5=D4=D3=D4=D7=D5=C0=D4 =D7= =D3=C9=D3=D4=C5=CD=C5); 3. =F3=CB=CF=D0=C9=D2=CF=D7=C1=CE =D3=C9=D3=D4=C5=CD=CE=D9=CA /etc/evms.c= onf; 4. =E4=CF=C2=C1=D7=CC=C5=CE =CD=CF=C4=D5=CC=D8 dm_mod; 5. =F7 linuxrc =C4=CF=C2=C1=D7=CC=C5=CE =CB=CF=C4 =C4=CC=D1 =C1=CB=D4=C9=D7= =C1=C3=C9=C9 EVMS. PS: =E4=D5=CD=C1=C0 =D0=CF=D7=C5=D3=C9=D4=D8 =CE=C1 mkinitrd FR. --=20 =F3 =D5=D7=C1=D6=C5=CE=C9=C5=CD. =E1=CC=C5=CB=D3=C5=CA. --------------020907030805080606070907 Content-Type: text/x-patch; name="mkinitrd.evms.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="mkinitrd.evms.patch" --- mkinitrd.orig 2006-06-12 21:32:06 +0400 +++ mkinitrd 2006-09-04 15:16:46 +0400 @@ -139,6 +139,7 @@ MODULES_DIR= MODULES_CONF= HAVE_RAID= +HAVE_EVMS= FOUND_NON_PCI_IDE= LSPCI=/usr/bin/lspci @@ -154,6 +155,11 @@ IGNORE_MODNAMES=" $IGNORE_MODNAMES ppa imm ide_scsi usb_storage" LOADED_MODNAMES= +PRE_EVMS_MODNAMES="dm_mod" +EVMS_ACTIVATE="/sbin/evms_activate" +EVMS_CONFIG="/etc/evms.conf" +EVMS_PLUGINS_REG="/(aix)|(bbr)|(bsd)|(disk)|(dos)|(drivelink)|(gpt)|(lvm)|(md)|(os2)|(s390)|(snapshot)[^[:space:]]*\.so" + loopDev= loopFs= loopFile= @@ -183,6 +189,59 @@ fi } +LIBS_REG="/lib\(\|64\)/[^[:space:]]*\.so\(\.[^[:space:]]*\|\)" +AddLibs() +{ + local list="$@" i + ( + ldd $list | \ + grep -s "${LIBS_REG}[[:space:]]" | \ + sed -e "s@^.*[[:space:]]\(${LIBS_REG}\)[[:space:]].*@\1@" + for i in $list; do + echo "$i" + done + ) | sort | uniq +} + +AddLibsAll() +{ + local list="$@" newlist + newlist=`AddLibs "$list"` + while [ "x$list" != "x$newlist" ] ; do + list="$newlist" + newlist=`AddLibs "$list"` + done + echo $list +} + +LinksAndFiles() +{ + local list="$@" i + for i in $list ; do + echo "$i" + readlink -f "$i" + done | sort | uniq +} + +EvmsLibdir() +{ + local list="$@" i + for i in $list ; do + echo "$i" + done | sed -n '\@/lib\(\|64\)/libevms@s@.*\(/lib\(\|64\)\)/libevms.*@\1@p' | head -n1 +} + +EVMS_FILES_ALL= +ListEvmsFilesAll() +{ + local list libdir list_plug list_all + list=`AddLibs $EVMS_ACTIVATE` + libdir=`EvmsLibdir $list` + list_plug=`find $libdir/evms -name '*.so' | egrep -s "$EVMS_PLUGINS_REG"` + list=`AddLibsAll $list_plug $list` + EVMS_FILES_ALL=`LinksAndFiles $list $EVMS_CONFIG` +} + InList() { local value="$1" list="$2" i @@ -927,6 +986,24 @@ echo $(( ($2 & 0xff) | ($1 << 8) | (($2 & ~0xff) << 12) )) } /bin/mount -t proc proc /proc +EOF + + if [ -n "$HAVE_EVMS" ]; then + Mkdir -p "$MNTDIR/dev/evms/" + Mkdir -p "$MNTDIR/var/lock/" + ListEvmsFilesAll + Cp --parents -d $EVMS_FILES_ALL "$MNTDIR/" + + cat >>"$RCFILE" <<'EOF' +echo mounting /dev/evms +/bin/mount -t tmpfs -o size=16k evms /dev/evms +echo mounting /var/lock +/bin/mount -t tmpfs -o size=16k tmpfs /var/lock +echo Starting EVMS +/sbin/evms_activate +EOF + fi + cat >>"$RCFILE" <<'EOF' read cmdline >"$RCFILE" <<'EOF' +/bin/umount /var/lock +/bin/umount /dev/evms +EOF + fi + + cat >>"$RCFILE" <<'EOF' /bin/umount /proc EOF @@ -1080,6 +1167,7 @@ --preload MODULENAME load MODULENAME before all found automatically. --with MODULENAME load MODULENAME after all found automatically. --with-raid enable software RAID (md) support. +--with-evms enable EVMS (/dev/evms) support. --omit-scsi-modules do not load any SCSI modules. --omit-ide-modules do not load any IDE modules. --omit-raid-modules do not load any raid modules. @@ -1101,7 +1189,7 @@ [ -n "$1" ] && Exit "$1" || Exit } -TEMP=`getopt -n "$PROG" -o fhvd -l help,version,verbose,debug,force,ifneeded,omit-scsi-modules,omit-ide-modules,omit-raid-modules,with-raid,pause,image-version,nocompress,nobootsplash,strict,fstab:,before:,preload:,with:,after: -- "$@"` || Usage 1 +TEMP=`getopt -n "$PROG" -o fhvd -l help,version,verbose,debug,force,ifneeded,omit-scsi-modules,omit-ide-modules,omit-raid-modules,with-raid,with-evms,pause,image-version,nocompress,nobootsplash,strict,fstab:,before:,preload:,with:,after: -- "$@"` || Usage 1 eval set -- "$TEMP" img_vers= @@ -1155,6 +1243,11 @@ HAVE_RAID=1 shift ;; + --with-evms) + HAVE_EVMS=1 + POSTLOAD_MODNAMES="$POSTLOAD_MODNAMES $PRE_EVMS_MODNAMES" + shift + ;; --pause) pause=1 shift --------------020907030805080606070907-- --------------enig7AE40D15CEEA066E96008C63 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2.2 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org iQEVAwUBRPwSiT0KZX1FX4J6AQIwyQf/Wu76zdDu+U/+YUiktnj0pkFv9GLeGMxa +ca7fICcF8c5OO+s9gxWYXivsYOb76aybB6/W3LXaP3gAPwGvi48dHXKS9/zwrSm 0CMP66LwpPVp3RJ1S4dC9vPUZBNrhbqYQ1ExqRiajeaal6NTv3D7p7DAF45Y8F/F 2Yvz/O8nLekgbp68FX6o61UkUevCvAF2xdu/D6Vop38DML/rilzdYyJ/AHQqQNL/ JhyoW98BV+SLz+UqMqJOibmp6wp/qxTQ+uHyEY8XVaqa9+ONQTDcT5stVLPNzz+3 sYqbmqSwEI+Yw+qIFE3BdDnJikOo8A0kPDOBqSzhKeOandeOcydgTw== =Gj3F -----END PGP SIGNATURE----- --------------enig7AE40D15CEEA066E96008C63--