diff options
| author |   Christian Zoffoli <xmerlin@gentoo.org> | 2008-03-21 11:59:52 +0000 |
|---|---|---|
| committer | Christian Zoffoli <xmerlin@gentoo.org> | 2008-03-21 11:59:52 +0000 |
| commit | 0ba2a9cb91b22dc2597f373516f75bec10fb992f (patch) | |
| tree | 8441f7385a2996816cef1667ab9651f6e69741de /sys-fs/gfs | |
| parent | amd64/x86 stable, bug #213813 (diff) | |
| download | historical-0ba2a9cb91b22dc2597f373516f75bec10fb992f.tar.gz historical-0ba2a9cb91b22dc2597f373516f75bec10fb992f.tar.bz2 historical-0ba2a9cb91b22dc2597f373516f75bec10fb992f.zip | |
Removed gulm from the init script, now it's deprecated.
Package-Manager: portage-2.1.4.4
Diffstat (limited to 'sys-fs/gfs')
| -rw-r--r-- | sys-fs/gfs/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-fs/gfs/Manifest | 10 | ||||
| -rwxr-xr-x | sys-fs/gfs/files/gfs-2.0x.rc | 26 |
3 files changed, 12 insertions, 29 deletions
diff --git a/sys-fs/gfs/ChangeLog b/sys-fs/gfs/ChangeLog index 989dae1f25a2..ad2197eb54e3 100644 --- a/sys-fs/gfs/ChangeLog +++ b/sys-fs/gfs/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-fs/gfs # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/gfs/ChangeLog,v 1.31 2008/03/17 23:24:23 xmerlin Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/gfs/ChangeLog,v 1.32 2008/03/21 11:59:51 xmerlin Exp $ + + 21 Mar 2008; Christian Zoffoli <xmerlin@gentoo.org> files/gfs-2.0x.rc: + Removed gulm from the init script, now it's deprecated. 17 Mar 2008; Christian Zoffoli <xmerlin@gentoo.org> files/gfs-2.0x.rc: Fixed bug #209267, now gfs init script honours options in fstab. diff --git a/sys-fs/gfs/Manifest b/sys-fs/gfs/Manifest index f15f4017e376..13c2e199d5ba 100644 --- a/sys-fs/gfs/Manifest +++ b/sys-fs/gfs/Manifest @@ -2,7 +2,7 @@ Hash: SHA1 AUX gfs-1.0x.rc 4406 RMD160 9e69b6f2974c65f6965f52bf66bc232ced1aa148 SHA1 338134883767d30af5e09125d46dca53d8d46ae6 SHA256 e79009c7ecc72de287508322244d0660ec3d090914827208344cced750f1bb68 -AUX gfs-2.0x.rc 4468 RMD160 064ab66256154edee85fe8eeda847d7c0121fdd8 SHA1 b1f351a81a0c35e3f89ffdc5f23036e3305155b2 SHA256 787b3aa3fedc892311b494c291983647a01db6135cbc459b4c31545a261ffb56 +AUX gfs-2.0x.rc 3959 RMD160 47af3ef7e75fead4164f85da8828ec1fb87d48bb SHA1 fcdc78c4c98d5214c4a0ef8ca9b782d0732094b0 SHA256 b6dd7eaa51728576ffd8125bab892e19881c7853bfcde8325db94d1a41996886 DIST cluster-1.02.00.tar.gz 1356451 RMD160 e9c0cdd1f5a7542c8a4ea38ccf6d057767269dc5 SHA1 d74cadb1ef21d1cfda333b20d7ef20272e0002d6 SHA256 de45885146f1481808f7a34af5e6b7e2042895a4e3844eaa6161f942345c7849 DIST cluster-1.03.00.tar.gz 1658274 RMD160 6fc16e2edba73dd1a83ecfad749b1553eca6d938 SHA1 c205d8ec034433c33f26724f7f69b0028d2a63d4 SHA256 e61c2438c7ee8d546aec9dd86ee1851c9a71f127c25ad1fb0c59eb4ed534e97b DIST cluster-1.04.00.tar.gz 1663798 RMD160 5b241f38123c9ad65faf2a9eda7aa3e2dabee839 SHA1 af3bb244a11a6a26c31b142009f6c1f771799337 SHA256 6f4b48e67383681ea6ad6e2907b56e755049816186375c4f2bcb9482da31c2c2 @@ -12,12 +12,12 @@ EBUILD gfs-1.02.00-r1.ebuild 1406 RMD160 1b7faed1faea4223bce965468539e5a5dee61b4 EBUILD gfs-1.03.00.ebuild 1124 RMD160 2f4323d575b357b29554947334ea05ea3ab13734 SHA1 969520150fb6ad47669722a742c8cdaa91341310 SHA256 e18bb18e5f61c96acf5dcffac0c7a46bb705f57ddb0b0e86f1212a45460fbcdb EBUILD gfs-1.04.00.ebuild 1125 RMD160 6208632ec8a1bbe6ea0886d3944b3a0db2212bb4 SHA1 0c10be46d403f50996c6df98ccf1345dc60b7ac6 SHA256 769ed1e4831bb8463fabadc0813e86c6b2bdd45b0b94e468ec63d3d87ff946c3 EBUILD gfs-2.02.00.ebuild 2037 RMD160 92bd5a015586443ad1e9f17166d1ff08803d930a SHA1 d95ab859991403e9062253757068364b307c090b SHA256 4778decc4c9f75e2e5b8e35a3d71b7ebcc002b86d67e0b08ad3cf8b0d5e76c45 -MISC ChangeLog 4499 RMD160 12ac33808a42759e2d99f92743beca6c6c5066a3 SHA1 a1156b2e613d042218fa108af8c5b2483107b7af SHA256 7a4252578ace1fa799f95ef179c62c40f036774baf6898e3ae95240cf0f43717 +MISC ChangeLog 4631 RMD160 df2f97326b00da392223f393c6bec3d8cf3bdee2 SHA1 107de75a2cf0138e0e5bc6d018ef8165ff44eb3c SHA256 165b1575206f5ade9d0beda67cb197f8d480e683616430dde2da7d9469789e2b MISC metadata.xml 229 RMD160 4dcf17b88c5f4db2e817f473f3e8269b0bff2e6e SHA1 e6315be43241c55bdc0d12a42fa05632c5ff9b79 SHA256 49e13d2d49bef7298e3bb665ebeceeff9b0880fae5ff639cb8405993504f244f -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.7 (GNU/Linux) -iD8DBQFH3v2wgMUyd/cdjWsRAqCuAJ9jT1zeFbYyF65PIsfcV5cGSZ+JFgCeLlg+ -yUie3HLA/FGtbAKkkaZoBnU= -=YOK9 +iD8DBQFH46NLgMUyd/cdjWsRAscTAJ926JzjaSdpdHWDdU/MuROyTld57gCfdVDG +lSjXNszWjteh2QGQ8e3+Jy0= +=lygN -----END PGP SIGNATURE----- diff --git a/sys-fs/gfs/files/gfs-2.0x.rc b/sys-fs/gfs/files/gfs-2.0x.rc index 574afb828285..d1604a2bb972 100755 --- a/sys-fs/gfs/files/gfs-2.0x.rc +++ b/sys-fs/gfs/files/gfs-2.0x.rc @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/sys-fs/gfs/files/gfs-2.0x.rc,v 1.2 2008/03/17 23:24:24 xmerlin Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/gfs/files/gfs-2.0x.rc,v 1.3 2008/03/21 11:59:52 xmerlin Exp $ opts="${opts} mountall" @@ -121,35 +121,15 @@ unload_modules() { } load_gfs_modules() { - local modules - - # detect cluster/locking manager cman+dlm or gulm ? - if [ -d /proc/cluster/config/cman ]; then - if [ ! -d /proc/cluster/lock_dlm ]; then - modules="${modules} lock_dlm" - fi - else - if [ ! -d /proc/cluster/lock_gulm ]; then - modules="${modules} lock_gulm" - fi - fi if [ ! -f /proc/fs/gfs ]; then - modules="${modules} gfs" + load_modules gfs fi - load_modules ${modules} } unload_gfs_modules() { if [ -f /proc/fs/gfs ]; then - modules="gfs lock_harness" - fi - if [ -d /proc/cluster/lock_dlm ]; then - modules="${modules} lock_dlm" - fi - if [ -d /proc/cluster/lock_gulm ]; then - modules="${modules} lock_gulm" + unload_modules gfs fi - unload_modules ${modules} } mountall() { |