* Moved helpers, common and triggers dirs into xbps-src, where they belong. * Renamed the templates dir to srcpkgs, it was so redundant before. * Make it possible to add subpkgs with no restriction in names, for example udev now has a subpkgs called "libgudev". Previously subpkgs were named "${sourcepkg}-${pkgname}". * xbps-src: changed to look for template files in current directory. That means that most arguments from the targets have been removed. * xbps-src: added a reinstall target, to remove + install. * xbps-src: do not overwrite binpkgs by default, skip them. And more that I forgot because it's a mega-commit that I've been working for some days already... --HG-- extra : convert_revision : 0f466878584d1e6895d2a234f07ea1b2d1e61b3e
11 lines
390 B
Diff
11 lines
390 B
Diff
--- init.d/network.in.orig 2009-10-21 13:58:01.000000000 +0200
|
|
+++ init.d/network.in 2009-10-21 13:58:24.000000000 +0200
|
|
@@ -174,7 +174,7 @@ start()
|
|
{
|
|
local cr=0 r= int= intv= cmd= args= upcmd=
|
|
|
|
- if [ -z "$domainname" && -s /etc/defaultdomain ]; then
|
|
+ if [ -z "$domainname" -a -s /etc/defaultdomain ]; then
|
|
domainname=$(cat /etc/defaultdomain)
|
|
fi
|
|
if [ -n "$domainname" ]; then
|