Compare commits
8 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a2f0afb8bc | ||
|
|
430fa132f2 | ||
|
|
12cd7ce9de | ||
|
|
167acac140 | ||
|
|
f839ba27c5 | ||
|
|
80dd6aac5f | ||
|
|
0d00b8d8ab | ||
|
|
551bdff2fb |
48
ChangeLog
48
ChangeLog
@@ -1,3 +1,51 @@
|
|||||||
|
commit 12cd7ce9dea73926c203c5d64e425d51e209425a
|
||||||
|
Author: William Hubbs <w.d.hubbs@gmail.com>
|
||||||
|
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||||
|
|
||||||
|
build: install pam files
|
||||||
|
|
||||||
|
commit 167acac1407782d454be2cc413431c00498e94ed
|
||||||
|
Author: William Hubbs <w.d.hubbs@gmail.com>
|
||||||
|
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||||
|
|
||||||
|
meson: typo fix
|
||||||
|
|
||||||
|
commit f839ba27c5e52990ca9c6431bba4455a1124f81d
|
||||||
|
Author: William Hubbs <w.d.hubbs@gmail.com>
|
||||||
|
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||||
|
|
||||||
|
version 0.44.1
|
||||||
|
|
||||||
|
commit 80dd6aac5fcb1f17b86d35db2babe487b90d7081
|
||||||
|
Author: William Hubbs <w.d.hubbs@gmail.com>
|
||||||
|
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||||
|
|
||||||
|
update ChangeLog
|
||||||
|
|
||||||
|
commit 0d00b8d8abe33c4d824446ed989e8cc3166590b4
|
||||||
|
Author: William Hubbs <w.d.hubbs@gmail.com>
|
||||||
|
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||||
|
|
||||||
|
build: fix sysvinit script installation
|
||||||
|
|
||||||
|
commit 551bdff2fbe61452187d5d492377b876e868a9fb
|
||||||
|
Author: William Hubbs <w.d.hubbs@gmail.com>
|
||||||
|
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||||
|
|
||||||
|
build: fix symlinks
|
||||||
|
|
||||||
|
commit 803aa1c637c42352c05a520dbb02bee6c03ccf75
|
||||||
|
Author: William Hubbs <w.d.hubbs@gmail.com>
|
||||||
|
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||||
|
|
||||||
|
version 0.44
|
||||||
|
|
||||||
|
commit fb186a38673201a7a25d6a7c1516fcb734020ee1
|
||||||
|
Author: William Hubbs <w.d.hubbs@gmail.com>
|
||||||
|
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||||
|
|
||||||
|
update ChangeLog
|
||||||
|
|
||||||
commit c9b64b64fa9b2d2ee31684e8d35375f4c5bddba1
|
commit c9b64b64fa9b2d2ee31684e8d35375f4c5bddba1
|
||||||
Author: William Hubbs <w.d.hubbs@gmail.com>
|
Author: William Hubbs <w.d.hubbs@gmail.com>
|
||||||
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
NAME= openrc
|
NAME= openrc
|
||||||
VERSION= 0.44
|
VERSION= 0.44.2
|
||||||
PKG= ${NAME}-${VERSION}
|
PKG= ${NAME}-${VERSION}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
project('OpenRC', 'c',
|
project('OpenRC', 'c',
|
||||||
version : '0.44',
|
version : '0.44.2',
|
||||||
license: 'BSD-2',
|
license: 'BSD-2',
|
||||||
default_options : [
|
default_options : [
|
||||||
'c_std=c99',
|
'c_std=c99',
|
||||||
@@ -164,6 +164,9 @@ subdir('etc')
|
|||||||
subdir('init.d')
|
subdir('init.d')
|
||||||
subdir('local.d')
|
subdir('local.d')
|
||||||
subdir('man')
|
subdir('man')
|
||||||
|
if get_option('pam')
|
||||||
|
subdir('pam')
|
||||||
|
endif
|
||||||
if get_option('pkgconfig')
|
if get_option('pkgconfig')
|
||||||
subdir('pkgconfig')
|
subdir('pkgconfig')
|
||||||
endif
|
endif
|
||||||
@@ -180,7 +183,8 @@ meson.add_install_script('tools/meson_runlevels.sh',
|
|||||||
os,
|
os,
|
||||||
get_option('newnet') ? 'yes' : 'no',
|
get_option('newnet') ? 'yes' : 'no',
|
||||||
rc_libexecdir,
|
rc_libexecdir,
|
||||||
get_option('sysconfdir'))
|
get_option('sysconfdir'),
|
||||||
|
get_option('sysvinit') ? 'yes' : 'no')
|
||||||
meson.add_install_script('tools/meson_final.sh',
|
meson.add_install_script('tools/meson_final.sh',
|
||||||
rc_libexecdir,
|
rc_libexecdir,
|
||||||
os)
|
os)
|
||||||
|
|||||||
9
pam/meson.build
Normal file
9
pam/meson.build
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
pam_dir = get_option('sysconfdir') / 'pam.d'
|
||||||
|
|
||||||
|
pam_files = [
|
||||||
|
'start-stop-daemon',
|
||||||
|
'supervise-daemon',
|
||||||
|
]
|
||||||
|
|
||||||
|
install_data(pam_files,
|
||||||
|
install_dir : pam_dir)
|
||||||
6
pam/start-stop-daemon
Normal file
6
pam/start-stop-daemon
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
#%PAM-1.0
|
||||||
|
|
||||||
|
auth required pam_permit.so
|
||||||
|
account required pam_permit.so
|
||||||
|
password required pam_deny.so
|
||||||
|
session optional pam_limits.so
|
||||||
6
pam/supervise-daemon
Normal file
6
pam/supervise-daemon
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
#%PAM-1.0
|
||||||
|
|
||||||
|
auth required pam_permit.so
|
||||||
|
account required pam_permit.so
|
||||||
|
password required pam_deny.so
|
||||||
|
session optional pam_limits.so
|
||||||
@@ -12,10 +12,10 @@ scripts_Linux = [
|
|||||||
]
|
]
|
||||||
|
|
||||||
scripts_sysvinit = [
|
scripts_sysvinit = [
|
||||||
'halt',
|
'halt.in',
|
||||||
'poweroff',
|
'poweroff.in',
|
||||||
'shutdown',
|
'shutdown.in',
|
||||||
'reboot',
|
'reboot.in',
|
||||||
]
|
]
|
||||||
|
|
||||||
install_data(scripts_internal,
|
install_data(scripts_internal,
|
||||||
|
|||||||
@@ -12,3 +12,8 @@ for f in $binaries; do
|
|||||||
"${DESTDIR}${sbindir}/${f}"
|
"${DESTDIR}${sbindir}/${f}"
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
# sysvinit is active when halt exits
|
||||||
|
if [ -x "${DESTDIR}${rc_libexecdir}/bin/halt" ]; then
|
||||||
|
ln -snf "${DESTDIR}${sbindir}/openrc-init" \
|
||||||
|
"${DESTDIR}${sbindir}/init"
|
||||||
|
fi
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ rc_misc_c = files([
|
|||||||
'rc-misc.c',
|
'rc-misc.c',
|
||||||
])
|
])
|
||||||
|
|
||||||
rc_plugin_c = ([
|
rc_plugin_c = files([
|
||||||
'rc-plugin.c',
|
'rc-plugin.c',
|
||||||
])
|
])
|
||||||
|
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ os="$1"
|
|||||||
net="$2"
|
net="$2"
|
||||||
rc_libexecdir="$3"
|
rc_libexecdir="$3"
|
||||||
sysconfdir="$4"
|
sysconfdir="$4"
|
||||||
|
sysvinit="$5"
|
||||||
|
|
||||||
init_d_dir="${sysconfdir}/init.d"
|
init_d_dir="${sysconfdir}/init.d"
|
||||||
leveldir="${sysconfdir}/runlevels"
|
leveldir="${sysconfdir}/runlevels"
|
||||||
@@ -90,5 +91,11 @@ if ! test -d "${DESTDIR}${shutdowndir}"; then
|
|||||||
ln -snf "${init_d_dir}/$x" "${DESTDIR}${shutdowndir}/$x"
|
ln -snf "${init_d_dir}/$x" "${DESTDIR}${shutdowndir}/$x"
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
if test "${sysvinit}" = yes && test "${os}" = Linux; then \
|
||||||
|
for x in tty1 tty2 tty3 tty4 tty5 tty6; do
|
||||||
|
ln -snf "${init_d_dir}/agetty" "${DESTDIR}/${init_d_dir}/agetty.$x"
|
||||||
|
ln -snf "${init_d_dir}/agetty.$x" "${DESTDIR}/${defaultdir}/agetty.$x"
|
||||||
|
done;
|
||||||
|
fi
|
||||||
|
|
||||||
ln -snf "${rc_libexecdir}"/sh/functions.sh "${DESTDIR}/${init_d_dir}"
|
ln -snf "${rc_libexecdir}"/sh/functions.sh "${DESTDIR}/${init_d_dir}"
|
||||||
|
|||||||
Reference in New Issue
Block a user