Moving hooks to hooks/live, both in live-build sources and live-build configs.
Really soon live-build will support building non-live images out-of-the-box. Therefore moving hooks into a live specific subdirectory.
This commit is contained in:
parent
1a5fda595f
commit
d18cb12cc1
|
@ -59,9 +59,9 @@ done
|
|||
|
||||
## Processing local hooks
|
||||
|
||||
if Find_files config/hooks/*.binary
|
||||
if Find_files config/hooks/live/*.binary
|
||||
then
|
||||
for HOOK in config/hooks/*.binary
|
||||
for HOOK in config/hooks/live/*.binary
|
||||
do
|
||||
# Making hook executable
|
||||
if [ ! -x "${HOOK}" ]
|
||||
|
|
|
@ -79,12 +79,12 @@ fi
|
|||
|
||||
## Processing local hooks
|
||||
|
||||
if Find_files config/hooks/*.chroot
|
||||
if Find_files config/hooks/live/*.chroot
|
||||
then
|
||||
# Restoring cache
|
||||
Restore_cache cache/packages.chroot
|
||||
|
||||
for _HOOK in config/hooks/*.chroot
|
||||
for _HOOK in config/hooks/live/*.chroot
|
||||
do
|
||||
# Copying hook
|
||||
cp "${_HOOK}" chroot/root
|
||||
|
|
|
@ -1312,16 +1312,16 @@ then
|
|||
rmdir --ignore-fail-on-non-empty local > /dev/null 2>&1 || true
|
||||
fi
|
||||
|
||||
mkdir -p config/hooks
|
||||
mkdir -p config/hooks/live
|
||||
mkdir -p config/includes config/includes.bootstrap config/includes.chroot config/includes.binary config/includes.source
|
||||
|
||||
Echo_message "Symlinking hooks..."
|
||||
|
||||
for _HOOK in "${LIVE_BUILD}"/share/hooks/*.hook* /usr/share/live/build/hooks/*.hook*
|
||||
for _HOOK in "${LIVE_BUILD}"/share/hooks/live/*.hook* /usr/share/live/build/hooks/live/*.hook*
|
||||
do
|
||||
if [ -e "${_HOOK}" ] && [ ! -e "config/hooks/$(basename ${_HOOK})" ]
|
||||
if [ -e "${_HOOK}" ] && [ ! -e "config/hooks/live/$(basename ${_HOOK})" ]
|
||||
then
|
||||
ln -s "${_HOOK}" "config/hooks/$(basename ${_HOOK})"
|
||||
ln -s "${_HOOK}" "config/hooks/live/$(basename ${_HOOK})"
|
||||
fi
|
||||
done
|
||||
|
||||
|
|
|
@ -59,9 +59,9 @@ done
|
|||
|
||||
## Processing local hooks
|
||||
|
||||
if Find_files config/hooks/*.source
|
||||
if Find_files config/hooks/live/*.source
|
||||
then
|
||||
for HOOK in config/hooks/*.source
|
||||
for HOOK in config/hooks/live/*.source
|
||||
do
|
||||
# Making hook executable
|
||||
if [ ! -x "${HOOK}" ]
|
||||
|
|
Loading…
Reference in New Issue