From c0448c2536b7fb05e3db7d3f30bd49ca3642854f Mon Sep 17 00:00:00 2001 From: Igor Pashev Date: Sat, 14 Jan 2012 19:07:22 +0300 Subject: Illumos layout --- debian/conffiles | 1 - debian/control | 2 +- debian/directory-list | 16 +++++++++-- debian/links | 4 +++ debian/rules | 8 +++++- etc/debian_version | 2 +- etc/issue | 2 +- etc/issue.net | 2 +- origins/dyson | 3 ++ share/nsswitch.conf | 79 ++++++++++++++++++++++++++++++++++++++++++--------- 10 files changed, 97 insertions(+), 22 deletions(-) create mode 100644 debian/links create mode 100644 origins/dyson diff --git a/debian/conffiles b/debian/conffiles index 9d31221..6e588fc 100644 --- a/debian/conffiles +++ b/debian/conffiles @@ -1,5 +1,4 @@ /etc/debian_version /etc/dpkg/origins/debian -/etc/host.conf /etc/issue /etc/issue.net diff --git a/debian/control b/debian/control index b5452b9..3cba756 100644 --- a/debian/control +++ b/debian/control @@ -15,5 +15,5 @@ Breaks: initscripts (<< 2.88dsf-13.3) Description: Debian base system miscellaneous files This package contains the basic filesystem hierarchy of a Debian system, and several important miscellaneous files, such as /etc/debian_version, - /etc/host.conf, /etc/issue, /etc/motd, /etc/profile, /etc/nsswitch.conf, + /etc/issue, /etc/motd, /etc/profile, /etc/nsswitch.conf, and others, and the text of several common licenses in use on Debian systems. diff --git a/debian/directory-list b/debian/directory-list index 862be7d..12d0efa 100644 --- a/debian/directory-list +++ b/debian/directory-list @@ -1,32 +1,44 @@ -bin boot dev +devices etc etc/default +etc/devices +etc/dfs etc/profile.d etc/skel home +kernel lib +media mnt +opt +platform proc root -run sbin +system +system/contract +system/object tmp usr usr/bin usr/games usr/include +usr/kernel usr/lib +usr/platform usr/sbin usr/share usr/share/common-licenses usr/share/dict +usr/share/doc usr/share/info usr/share/man usr/share/misc usr/src var +var/adm var/backups var/cache var/lib diff --git a/debian/links b/debian/links new file mode 100644 index 0000000..2d04a59 --- /dev/null +++ b/debian/links @@ -0,0 +1,4 @@ +. usr/ccs +. usr/gnu +usr/bin bin +var/run run diff --git a/debian/rules b/debian/rules index 3848b05..820e819 100755 --- a/debian/rules +++ b/debian/rules @@ -10,8 +10,11 @@ endif ifeq ($(DEB_HOST_GNU_SYSTEM),gnu) OSNAME=GNU/Hurd endif +ifeq ($(DEB_HOST_ARCH_OS),illumos) + OSNAME=Illumos +endif -VENDORFILE = debian +VENDORFILE = dyson VERSION = $(shell cat etc/debian_version) @@ -28,6 +31,9 @@ binary-arch: build install -d debian/tmp/DEBIAN $(docdir) debian/tmp/etc/dpkg/origins cp -a origins/* debian/tmp/etc/dpkg/origins cd debian/tmp && install -d usr/share/$(package) + cd debian/tmp && cat ../links | while read l; do \ + ln -sf $$l; \ + done install -p -m 644 debian/changelog debian/README \ debian/README.FHS $(docdir) cat debian/copyright.in | sed -e "s&#OSNAME#&$(OSNAME)&g" \ diff --git a/etc/debian_version b/etc/debian_version index 743272a..16eaea9 100644 --- a/etc/debian_version +++ b/etc/debian_version @@ -1 +1 @@ -wheezy/sid +bok diff --git a/etc/issue b/etc/issue index 5e029b6..04cde71 100644 --- a/etc/issue +++ b/etc/issue @@ -1,2 +1,2 @@ -Debian #OSNAME# wheezy/sid \n \l +Dyson (Debian/Illumos) bok diff --git a/etc/issue.net b/etc/issue.net index 0f37acd..46d56c3 100644 --- a/etc/issue.net +++ b/etc/issue.net @@ -1 +1 @@ -Debian #OSNAME# wheezy/sid +Dyson (Debian/Illumos) bok diff --git a/origins/dyson b/origins/dyson new file mode 100644 index 0000000..0442e65 --- /dev/null +++ b/origins/dyson @@ -0,0 +1,3 @@ +Vendor: Dyson +Vendor-URL: http://188.120.236.176 +Bugs: http://188.120.236.176 diff --git a/share/nsswitch.conf b/share/nsswitch.conf index d2f03b0..ff4bafc 100644 --- a/share/nsswitch.conf +++ b/share/nsswitch.conf @@ -1,19 +1,70 @@ -# /etc/nsswitch.conf # -# Example configuration of GNU Name Service Switch functionality. -# If you have the `glibc-doc-reference' and `info' packages installed, try: -# `info libc "Name Service Switch"' for information about this file. +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# +# Copyright 2007 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. +# +#ident "%Z%%M% %I% %E% SMI" + +# +# /etc/nsswitch.dns: +# +# An example file that could be copied over to /etc/nsswitch.conf; it uses +# DNS for hosts lookups, otherwise it does not use any other naming service. +# +# "hosts:" and "services:" in this file are used only if the +# /etc/netconfig file has a "-" for nametoaddr_libs of "inet" transports. + +# DNS service expects that an instance of svc:/network/dns/client be +# enabled and online. + +passwd: files +group: files + +# You must also set up the /etc/resolv.conf file for DNS name +# server lookup. See resolv.conf(4). For lookup via mdns +# svc:/network/dns/multicast:default must also be enabled. See mdnsd(1M) +hosts: files dns mdns -passwd: compat -group: compat -shadow: compat +# Note that IPv4 addresses are searched for in all of the ipnodes databases +# before searching the hosts databases. +ipnodes: files dns mdns -hosts: files dns -networks: files +networks: files +protocols: files +rpc: files +ethers: files +netmasks: files +bootparams: files +publickey: files +# At present there isn't a 'files' backend for netgroup; the system will +# figure it out pretty quickly, and won't use netgroups at all. +netgroup: files +automount: files +aliases: files +services: files +printers: user files -protocols: db files -services: db files -ethers: db files -rpc: db files +auth_attr: files +prof_attr: files +project: files -netgroup: nis +tnrhtp: files +tnrhdb: files -- cgit v1.2.3