diff options
Diffstat (limited to 'systemd/NuTyX.patch')
| -rw-r--r-- | systemd/NuTyX.patch | 100 |
1 files changed, 100 insertions, 0 deletions
diff --git a/systemd/NuTyX.patch b/systemd/NuTyX.patch new file mode 100644 index 000000000..0a7e4c155 --- /dev/null +++ b/systemd/NuTyX.patch @@ -0,0 +1,100 @@ +--- configure.ac.old 2012-07-15 18:38:50.961999995 +0200 ++++ configure.ac 2012-07-15 18:41:44.681999995 +0200 +@@ -500,7 +500,7 @@ + AC_PATH_PROG([XSLTPROC], [xsltproc]) + AM_CONDITIONAL(HAVE_XSLTPROC, test x"$XSLTPROC" != x) + +-AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO],[Specify the distribution to target: One of fedora, suse, debian, ubuntu, arch, gentoo, slackware, altlinux, mandriva, meego, mageia, angstrom or other])) ++AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO],[Specify the distribution to target: One of fedora, suse, debian, ubuntu, arch, gentoo, slackware, altlinux, mandriva, meego, mageia, angstrom, nutyx or other])) + if test "z$with_distro" = "z"; then + if test "$cross_compiling" = yes; then + AC_MSG_WARN([Target distribution cannot be reliably detected when cross-compiling. You should specify it with --with-distro (see $0 --help for recognized distros)]) +@@ -589,6 +589,12 @@ + AC_DEFINE(TARGET_MAGEIA, [], [Target is Mageia]) + M4_DEFINES=-DTARGET_MAGEIA=1 + ;; ++ nutyx) ++ SYSTEM_SYSVINIT_PATH=/etc/rc.d/init.d ++ SYSTEM_SYSVRCND_PATH=/etc/rc.d ++ AC_DEFINE(TARGET_NUTYX, [], [Target is NuTyX]) ++ M4_DEFINES=-DTARGET_NUTYX=1 ++ ;; + other) + ;; + *) +@@ -642,6 +648,7 @@ + AM_CONDITIONAL(TARGET_MEEGO, test x"$with_distro" = xmeego) + AM_CONDITIONAL(TARGET_ANGSTROM, test x"$with_distro" = xangstrom) + AM_CONDITIONAL(TARGET_MAGEIA, test x"$with_distro" = xmageia) ++AM_CONDITIONAL(TARGET_NUTYX, test x"$with_distro" = xnutyx) + + AM_CONDITIONAL(HAVE_SYSV_COMPAT, test "$SYSTEM_SYSV_COMPAT" = "yes") + +--- Makefile.am.old 2012-07-17 01:24:28.502999995 +0200 ++++ Makefile.am 2012-07-17 01:24:21.946999995 +0200 +@@ -191,6 +191,12 @@ + -DKBD_SETFONT=\"/bin/setfont\" \ + -DDEFAULT_FONT=\"LatArCyrHeb-16\" + else ++if TARGET_NUTYX ++AM_CPPFLAGS += \ ++ -DKBD_LOADKEYS=\"/bin/loadkeys\" \ ++ -DKBD_SETFONT=\"/bin/setfont\" \ ++ -DDEFAULT_FONT=\"LatArCyrHeb-16\" ++else + AM_CPPFLAGS += \ + -DKBD_LOADKEYS=\"/bin/loadkeys\" \ + -DKBD_SETFONT=\"/bin/setfont\" \ +@@ -202,6 +208,7 @@ + endif + endif + endif ++endif + + # ------------------------------------------------------------------------------ + rootbin_PROGRAMS = \ +@@ -426,6 +433,11 @@ + systemd-rc-local-generator + endif + ++if TARGET_NUTYX ++dist_systemunit_DATA += \ ++ units/frugalware/display-manager.service ++endif ++ + dist_doc_DATA = \ + README \ + NEWS \ +--- src/journal/journalctl.c.old 2012-07-15 20:18:05.227999996 +0200 ++++ src/journal/journalctl.c 2012-07-15 20:18:39.341999995 +0200 +@@ -229,8 +229,8 @@ + } + + #ifdef HAVE_ACL +- if (!arg_quiet && geteuid() != 0 && in_group("adm") <= 0) +- log_warning("Showing user generated messages only. Users in the group 'adm' can see all messages. Pass -q to turn this message off."); ++ if (!arg_quiet && geteuid() != 0 && in_group("admin") <= 0) ++ log_warning("Showing user generated messages only. Users in the group 'admin' can see all messages. Pass -q to turn this message off."); + #endif + + r = sd_journal_open(&j, arg_local ? SD_JOURNAL_LOCAL_ONLY : 0); +--- src/journal/journald.c.old 2012-07-15 20:18:11.107999996 +0200 ++++ src/journal/journald.c 2012-07-15 20:18:23.791999995 +0200 +@@ -209,7 +209,7 @@ + } + + static void server_read_file_gid(Server *s) { +- const char *adm = "adm"; ++ const char *adm = "admin"; + int r; + + assert(s); +@@ -219,7 +219,7 @@ + + r = get_group_creds(&adm, &s->file_gid); + if (r < 0) +- log_warning("Failed to resolve 'adm' group: %s", strerror(-r)); ++ log_warning("Failed to resolve 'admin' group: %s", strerror(-r)); + + /* if we couldn't read the gid, then it will be 0, but that's + * fine and we shouldn't try to resolve the group again, so |