Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 284581 Details for
Bug 318727
net-misc/nxnode and net-misc/nxserver-freeedition don't work with a readonly /usr filesystem
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
nxnode-3.5.0.6.patch
nxnode-3.5.0.6.patch (text/plain), 3.19 KB, created by
Bruno Redondi
on 2011-08-25 10:12:18 UTC
(
hide
)
Description:
nxnode-3.5.0.6.patch
Filename:
MIME Type:
Creator:
Bruno Redondi
Created:
2011-08-25 10:12:18 UTC
Size:
3.19 KB
patch
obsolete
>--- /usr/portage/net-misc/nxnode/nxnode-3.5.0.6.ebuild 2011-08-24 10:13:08.000000000 +0200 >+++ nxnode-3.5.0.6.ebuild 2011-08-25 11:41:20.746080291 +0200 >@@ -35,9 +35,40 @@ > > S=${WORKDIR}/NX > >+move_dir() >+{ >+ if [[ -e "$1" && ! -L "$1" ]] ; then >+ mkdir -p "$2" >+ find "$1" -maxdepth 1 -print0 | \ >+ while read -d $'\0' src ; do >+ mv "${src}" "$2" >+ done >+ rm -rf "$1" >+ fi >+} >+ >+pkg_setup() { >+ if [ ! -h ${ROOT}/usr/NX/etc \ >+ -o ! -h ${ROOT}/usr/NX/var/db \ >+ -o ! -h ${ROOT}/usr/NX/var/log \ >+ -o ! -h ${ROOT}/usr/NX/var/run \ >+ -o ! -h ${ROOT}/usr/NX/home/nx ]; then >+ ewarn >+ ewarn "Collisions are expected here." >+ ewarn "Use COLLISION_IGNORE=\"/usr/NX/var /usr/NX/home\" emerge ... for this package," >+ ewarn "or remove previous versions of nxnode and nxserver-freeedition first." >+ ewarn >+ fi >+} >+ > pkg_preinst() > { >- enewuser nx -1 -1 /usr/NX/home/nx >+ enewuser nx -1 -1 /var/lib/NX >+ move_dir ${ROOT}/usr/NX/etc ${ROOT}/etc/NX >+ move_dir ${ROOT}/usr/NX/var/db ${ROOT}/var/db/NX >+ move_dir ${ROOT}/usr/NX/home/nx ${ROOT}/var/lib/NX >+ move_dir ${ROOT}/usr/NX/var/log ${ROOT}/var/log/NX >+ move_dir ${ROOT}/usr/NX/var/run ${ROOT}/var/run/NX > } > > src_prepare() >@@ -56,10 +87,11 @@ > dobin bin/$x > done > >- dodir /usr/NX/etc >- cp etc/node-debian.cfg.sample "${D}"/usr/NX/etc/node-gentoo.cfg.sample || die >- sed -e 's|COMMAND_FUSER = .*|COMMAND_FUSER = "/usr/bin/fuser"|;' -i "${D}"/usr/NX/etc/node-gentoo.cfg.sample || die >- cp etc/node.lic.sample "${D}"/usr/NX/etc/node.lic.sample || die >+ dodir /etc/NX >+ dosym /etc/NX /usr/NX/etc >+ cp etc/node-debian.cfg.sample "${D}"/etc/NX/node-gentoo.cfg.sample || die >+ sed -e 's|COMMAND_FUSER = .*|COMMAND_FUSER = "/usr/bin/fuser"|;' -i "${D}"/etc/NX/node-gentoo.cfg.sample || die >+ cp etc/node.lic.sample "${D}"/etc/NX/node.lic.sample || die > > dodir /usr/NX/lib > cp -R lib "${D}"/usr/NX || die >@@ -71,7 +103,15 @@ > cp -R share "${D}"/usr/NX || die > > dodir /usr/NX/var >- cp -R var "${D}"/usr/NX || die >+ dodir /usr/NX/home >+ dodir /var/db/NX >+ dosym /var/db/NX /usr/NX/var/db >+ dodir /var/lib/NX >+ dosym /var/lib/NX /usr/NX/home/nx >+ dodir /var/log/NX >+ dosym /var/log/NX /usr/NX/var/log >+ dodir /var/run/NX >+ dosym /var/run/NX /usr/NX/var/run > > dodir /etc/init.d > newinitd "${FILESDIR}"/nxnode-3.0.0-init nxsensor >@@ -80,14 +120,14 @@ > pkg_postinst() > { > # Only install license file if none is found >- if [ ! -f /usr/NX/etc/node.lic ]; then >- cp "${ROOT}"/usr/NX/etc/node.lic.sample "${ROOT}"/usr/NX/etc/node.lic || die >- chmod 0400 "${ROOT}"/usr/NX/etc/node.lic >- chown nx:0 "${ROOT}"/usr/NX/etc/node.lic >+ if [ ! -f "${ROOT}"/etc/NX/node.lic ]; then >+ cp "${ROOT}"/etc/NX/node.lic.sample "${ROOT}"/etc/NX/node.lic || die >+ chmod 0400 "${ROOT}"/etc/NX/node.lic >+ chown nx:0 "${ROOT}"/etc/NX/node.lic > fi > > # only run install on the first time >- if [ -f /usr/NX/etc/node.cfg ]; then >+ if [ -f "${ROOT}"/etc/NX/node.cfg ]; then > einfo "Running NoMachine's update script" > "${ROOT}"/usr/NX/scripts/setup/nxnode --update > else >@@ -99,5 +139,5 @@ > elog > elog " rc-update add nxsensor default" > elog >- elog "You will also need to change EnableSensor to 1 in /usr/NX/etc/node.cfg" >+ elog "You will also need to change EnableSensor to 1 in /etc/NX/node.cfg" > }
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 318727
:
230565
|
230567
|
231907
|
231961
|
231963
|
235393
|
235397
|
235401
|
245616
|
245622
|
251233
|
251235
|
260347
|
260349
|
260350
|
264581
|
264583
|
265795
|
274369
|
274371
| 284581 |
284583