osdyson
/
illumos-packaging
mirror of https://git.osdyson.ru/illumos/illumos-packaging.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

smf-init (4.3) unstable; urgency=medium 

* Use recent sources
  * Refreshed patches
  * Install /etc/default/init in postint with CMASK only
This commit is contained in:
Igor Pashev 2015-03-27 17:25:15 +03:00
parent dac90f68a6
commit 9d153482be
10 changed files with 40 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
smf-init/debian/changelog
View File

@ -1,3 +1,11 @@
smf-init (4.3) unstable; urgency=medium
* Use recent sources
* Refreshed patches
* Install /etc/default/init in postint with CMASK only
-- Igor Pashev <pashev.igor@gmail.com> Fri, 27 Mar 2015 17:18:42 +0300
smf-init (2.10+5) unstable; urgency=medium smf-init (2.10+5) unstable; urgency=medium
* Fixed patch mess * Fixed patch mess

2
smf-init/debian/control
View File

@ -4,7 +4,7 @@ Priority: required
Maintainer: Igor Pashev <pashev.igor@gmail.com> Maintainer: Igor Pashev <pashev.igor@gmail.com>
Build-Depends: Build-Depends:
dh-illumos, dh-illumos,
illumos-source-2.10, illumos-source-4.3,
libscf-dev, libscf-dev,
libbsm-dev, libbsm-dev,
libcontract-dev, libcontract-dev,

6
smf-init/debian/patches/halt-amd64.patch
View File

@ -1,8 +1,8 @@
Index: smf-init/usr/src/cmd/halt/halt.c Index: smf-init/usr/src/cmd/halt/halt.c
=================================================================== ===================================================================
--- smf-init.orig/usr/src/cmd/halt/halt.c 2013-01-25 09:05:46.836909693 +0000 --- smf-init.orig/usr/src/cmd/halt/halt.c
+++ smf-init/usr/src/cmd/halt/halt.c 2013-01-25 09:06:36.031341509 +0000 +++ smf-init/usr/src/cmd/halt/halt.c
@@ -87,7 +87,7 @@ @@ -90,7 +90,7 @@
#if defined(__sparc) #if defined(__sparc)
#define CUR_ELFDATA ELFDATA2MSB #define CUR_ELFDATA ELFDATA2MSB

18
smf-init/debian/patches/halt-no-grub.patch
View File

@ -1,8 +1,8 @@
Index: smf-init/usr/src/cmd/halt/halt.c Index: smf-init/usr/src/cmd/halt/halt.c
=================================================================== ===================================================================
--- smf-init.orig/usr/src/cmd/halt/halt.c 2012-10-08 00:25:24.000000000 +0000 --- smf-init.orig/usr/src/cmd/halt/halt.c
+++ smf-init/usr/src/cmd/halt/halt.c 2013-01-25 08:56:16.092106335 +0000 +++ smf-init/usr/src/cmd/halt/halt.c
@@ -80,9 +80,6 @@ @@ -83,9 +83,6 @@
#include <spawn.h> #include <spawn.h>
#include <libzfs.h> #include <libzfs.h>
@ -12,7 +12,7 @@ Index: smf-init/usr/src/cmd/halt/halt.c
#if !defined(TEXT_DOMAIN) #if !defined(TEXT_DOMAIN)
#define TEXT_DOMAIN "SYS_TEST" #define TEXT_DOMAIN "SYS_TEST"
@@ -131,12 +128,6 @@ @@ -134,12 +131,6 @@ static ctid_t startdct = -1;
*/ */
static char fastboot_mounted[MAXPATHLEN]; static char fastboot_mounted[MAXPATHLEN];
@ -25,7 +25,7 @@ Index: smf-init/usr/src/cmd/halt/halt.c
static int validate_ufs_disk(char *, char *); static int validate_ufs_disk(char *, char *);
static int validate_zfs_pool(char *, char *); static int validate_zfs_pool(char *, char *);
@@ -1041,49 +1032,6 @@ @@ -1044,49 +1035,6 @@ parse_fastboot_args(char *bootargs_buf,
if (*is_dryrun) if (*is_dryrun)
return (rc); return (rc);
@ -75,7 +75,7 @@ Index: smf-init/usr/src/cmd/halt/halt.c
/* Zero out the boot argument buffer as we will reconstruct it */ /* Zero out the boot argument buffer as we will reconstruct it */
bzero(bootargs_buf, buf_size); bzero(bootargs_buf, buf_size);
@@ -1667,10 +1615,6 @@ @@ -1657,10 +1605,6 @@ fail:
} else if (strlen(fastboot_mounted) != 0) { } else if (strlen(fastboot_mounted) != 0) {
(void) umount(fastboot_mounted); (void) umount(fastboot_mounted);
@ -88,9 +88,9 @@ Index: smf-init/usr/src/cmd/halt/halt.c
Index: smf-init/usr/src/cmd/halt/Makefile Index: smf-init/usr/src/cmd/halt/Makefile
=================================================================== ===================================================================
--- smf-init.orig/usr/src/cmd/halt/Makefile 2012-10-08 00:25:24.000000000 +0000 --- smf-init.orig/usr/src/cmd/halt/Makefile
+++ smf-init/usr/src/cmd/halt/Makefile 2013-01-25 08:56:32.960004565 +0000 +++ smf-init/usr/src/cmd/halt/Makefile
@@ -50,7 +50,6 @@ @@ -50,7 +50,6 @@ CPPFLAGS += -I../../uts/common/fs/zfs
CERRWARN += -_gcc=-Wno-unused-label CERRWARN += -_gcc=-Wno-unused-label
LDLIBS += -lbsm -lscf -lzfs -lgen LDLIBS += -lbsm -lscf -lzfs -lgen

12
smf-init/debian/patches/halt-pointers.patch
View File

@ -1,8 +1,8 @@
Index: smf-init/usr/src/cmd/halt/halt.c Index: smf-init/usr/src/cmd/halt/halt.c
=================================================================== ===================================================================
--- smf-init.orig/usr/src/cmd/halt/halt.c 2013-01-25 08:56:16.092106335 +0000 --- smf-init.orig/usr/src/cmd/halt/halt.c
+++ smf-init/usr/src/cmd/halt/halt.c 2013-01-25 09:05:46.836909693 +0000 +++ smf-init/usr/src/cmd/halt/halt.c
@@ -459,7 +459,7 @@ @@ -462,7 +462,7 @@ halt_zones()
{ {
pid_t pid; pid_t pid;
zoneid_t *zones; zoneid_t *zones;
@ -11,7 +11,7 @@ Index: smf-init/usr/src/cmd/halt/halt.c
int i; int i;
char zname[ZONENAME_MAX]; char zname[ZONENAME_MAX];
@@ -545,7 +545,7 @@ @@ -548,7 +548,7 @@ static void
check_zones_haltedness() check_zones_haltedness()
{ {
int t = 0, t_prog = 0; int t = 0, t_prog = 0;
@ -20,7 +20,7 @@ Index: smf-init/usr/src/cmd/halt/halt.c
do { do {
last_nz = nz; last_nz = nz;
@@ -1204,7 +1204,7 @@ @@ -1205,7 +1205,7 @@ main(int argc, char *argv[])
int qflag = 0, needlog = 1, nosync = 0; int qflag = 0, needlog = 1, nosync = 0;
int fast_reboot = 0; int fast_reboot = 0;
int prom_reboot = 0; int prom_reboot = 0;
@ -29,7 +29,7 @@ Index: smf-init/usr/src/cmd/halt/halt.c
int cmd, fcn, c, aval, r; int cmd, fcn, c, aval, r;
const char *usage; const char *usage;
const char *optstring; const char *optstring;
@@ -1568,7 +1568,7 @@ @@ -1558,7 +1558,7 @@ main(int argc, char *argv[])
} }
if (cmd == A_DUMP && nosync != 0) if (cmd == A_DUMP && nosync != 0)

2
smf-init/debian/patches/init-dont-set-timezone.patch
View File

@ -3,7 +3,7 @@ Index: smf-init/usr/src/cmd/init/init.c
=================================================================== ===================================================================
--- smf-init.orig/usr/src/cmd/init/init.c --- smf-init.orig/usr/src/cmd/init/init.c
+++ smf-init/usr/src/cmd/init/init.c +++ smf-init/usr/src/cmd/init/init.c
@@ -2015,6 +2015,11 @@ init_env() @@ -2021,6 +2021,11 @@ init_env()
(void) umask(cmask); (void) umask(cmask);
continue; continue;
} }

8
smf-init/debian/patches/init-linux-pam.patch
View File

@ -1,8 +1,8 @@
Index: smf-init/usr/src/cmd/init/init.c Index: smf-init/usr/src/cmd/init/init.c
=================================================================== ===================================================================
--- smf-init.orig/usr/src/cmd/init/init.c 2012-10-08 00:25:24.000000000 +0000 --- smf-init.orig/usr/src/cmd/init/init.c
+++ smf-init/usr/src/cmd/init/init.c 2013-01-20 01:07:37.743398218 +0000 +++ smf-init/usr/src/cmd/init/init.c
@@ -2602,6 +2602,7 @@ @@ -2610,6 +2610,7 @@ waitproc(struct PROC_TABLE *process)
/* /*
* notify_pam_dead(): calls into the PAM framework to close the given session. * notify_pam_dead(): calls into the PAM framework to close the given session.
*/ */
@ -10,7 +10,7 @@ Index: smf-init/usr/src/cmd/init/init.c
static void static void
notify_pam_dead(struct utmpx *up) notify_pam_dead(struct utmpx *up)
{ {
@@ -2617,7 +2618,7 @@ @@ -2625,7 +2626,7 @@ notify_pam_dead(struct utmpx *up)
(void) snprintf(ttyn, sizeof (ttyn), "%s", up->ut_line); (void) snprintf(ttyn, sizeof (ttyn), "%s", up->ut_line);
(void) snprintf(host, sizeof (host), "%s", up->ut_host); (void) snprintf(host, sizeof (host), "%s", up->ut_host);

2
smf-init/debian/patches/init-sulogin.patch
View File

@ -2,7 +2,7 @@ Index: smf-init/usr/src/cmd/init/init.c
=================================================================== ===================================================================
--- smf-init.orig/usr/src/cmd/init/init.c --- smf-init.orig/usr/src/cmd/init/init.c
+++ smf-init/usr/src/cmd/init/init.c +++ smf-init/usr/src/cmd/init/init.c
@@ -482,7 +482,7 @@ static char *SYSTTY = "/dev/systty"; /* @@ -485,7 +485,7 @@ static char *SYSTTY = "/dev/systty"; /*
static char *SYSCON = "/dev/syscon"; /* Virtual System console */ static char *SYSCON = "/dev/syscon"; /* Virtual System console */
static char *IOCTLSYSCON = "/etc/ioctl.syscon"; /* Last syscon modes */ static char *IOCTLSYSCON = "/etc/ioctl.syscon"; /* Last syscon modes */
static char *ENVFILE = "/etc/default/init"; /* Default env. */ static char *ENVFILE = "/etc/default/init"; /* Default env. */

1
smf-init/debian/smf-init.dirs
View File

@ -1 +1,2 @@
etc/default
etc/svc/volatile etc/svc/volatile

6
smf-init/debian/smf-init.postinst
View File

@ -10,6 +10,12 @@ configure() {
cp /usr/share/smf-init/inittab "$t" cp /usr/share/smf-init/inittab "$t"
fi fi
i=/etc/default/init
if ! [ -e "$i" ]; then
echo "Installing default $i"
echo "CMASK=022" > "$i"
fi
io=/etc/ioctl.syscon io=/etc/ioctl.syscon
if ! [ -e "$io" ]; then if ! [ -e "$io" ]; then
echo "Installing default $io" echo "Installing default $io"