Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
B
boot-user
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
66-service
Arch
boot-user
Commits
46f97cbd
Commit
46f97cbd
authored
5 years ago
by
Eric Vidal
Browse files
Options
Downloads
Patches
Plain Diff
fix multiple use of same instance
parent
cd857002
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
module/boot-user@/.configure/.xinitrc
+0
-1
0 additions, 1 deletion
module/boot-user@/.configure/.xinitrc
module/boot-user@/.configure/.xsession
+1
-1
1 addition, 1 deletion
module/boot-user@/.configure/.xsession
scripts/66-mods.sh
+12
-11
12 additions, 11 deletions
scripts/66-mods.sh
with
13 additions
and
13 deletions
module/boot-user@/.configure/.xinitrc
+
0
−
1
View file @
46f97cbd
...
...
@@ -17,7 +17,6 @@ done
66-all up
sleep
03
## Try consolekit
if
66-which
-q
ck-launch-session
;
then
...
...
This diff is collapsed.
Click to expand it.
module/boot-user@/.configure/.xsession
+
1
−
1
View file @
46f97cbd
...
...
@@ -9,4 +9,4 @@ for i in ${list[@]};do
done
66-all up
sleep
03
This diff is collapsed.
Click to expand it.
scripts/66-mods.sh
+
12
−
11
View file @
46f97cbd
...
...
@@ -56,6 +56,7 @@ mod="${mod%%@*}"
mod
=
"
${
mod
%%@*
}
@"
insta
=
"
${
target
[0]
}
"
insta
=
"
${
insta
##*@
}
"
service
=
"
${
mod
}${
insta
}
"
if
[[
!
-d
${
module_system
}
/
${
mod
}
]]
;
then
die
"fatal: module
${
mod
}
doesn't exist"
...
...
@@ -75,34 +76,34 @@ if [[ -z "${insta}" ]];then
die
"fatal: instance for
${
mod
}
is not set"
fi
if
[[
-d
${
service_system
}
/
${
mod
}
]]
;
then
if
[[
-d
${
service_system
}
/
${
service
}
]]
;
then
if
((
!
$force
))
;
then
die
"fatal:
${
service_system
}
/
${
mod
}
already exist"
die
"fatal:
${
service_system
}
/
${
service
}
already exist"
else
rm
-rf
${
service_system
}
/
${
mod
}
||
die
"fatal: unable to remove
${
service_system
}
/
${
mod
}
"
rm
-rf
${
service_system
}
/
${
service
}
||
die
"fatal: unable to remove
${
service_system
}
/
${
service
}
"
fi
fi
cp
-rT
${
module_system
}
/
${
mod
}
${
service_system
}
/
${
mod
}
||
die
"fatal: unable to cp
${
module_system
}
/
${
mod
}
to
${
service_system
}
/
${
mod
}
"
cp
-rT
${
module_system
}
/
${
mod
}
${
service_system
}
/
${
service
}
||
die
"fatal: unable to cp
${
module_system
}
/
${
mod
}
to
${
service_system
}
/
${
service
}
"
## @I in file
for
i
in
$(
find
${
service_system
}
/
${
mod
}
-mindepth
1
-type
f
)
;
do
for
i
in
$(
find
${
service_system
}
/
${
service
}
-mindepth
1
-type
f
)
;
do
sed
-i
"s:@I:
${
insta
}
:g"
$i
||
die
"fatal: unable to sed
${
i
}
"
done
## change directory name
for
i
in
$(
find
${
service_system
}
/
${
mod
}
-mindepth
1
-type
d|grep
-v
"configure"
)
;
do
for
i
in
$(
find
${
service_system
}
/
${
service
}
-mindepth
1
-type
d|grep
-v
"configure"
)
;
do
mv
$i
$(
66-echo
--
${
i
}
|sed
"s:@M:
${
insta
}
:g"
)
||
die
"fatal: unable to move
${
i
}
to
$(
echo
${
i
}
|sed
"s:@M:
${
insta
}
:g"
)
"
done
## change file name
for
i
in
$(
find
${
service_system
}
/
${
mod
}
-mindepth
1
-type
f|grep
-v
"configure"
)
;
do
for
i
in
$(
find
${
service_system
}
/
${
service
}
-mindepth
1
-type
f|grep
-v
"configure"
)
;
do
mv
$i
$(
66-echo
--
${
i
}
|sed
"s:@M:
${
insta
}
:g"
)
||
die
"fatal: unable to move
${
i
}
to
$(
echo
${
i
}
|sed
"s:@M:
${
insta
}
:g"
)
"
done
## run .configure scripts
if
[[
-x
${
service_system
}
/
${
mod
}
/.configure/configure
]]
;
then
cd
${
service_system
}
/
${
mod
}
/.configure/
${
service_system
}
/
${
mod
}
/.configure/configure
${
insta
}
||
die
"fatal: unable to configure
${
service_system
}
/
${
mod
}
"
rm
-rf
${
service_system
}
/
${
mod
}
/.configure
||
die
"fatal: unable to remove
${
service_system
}
/
${
mod
}
/.configure"
if
[[
-x
${
service_system
}
/
${
service
}
/.configure/configure
]]
;
then
cd
${
service_system
}
/
${
service
}
/.configure/
${
service_system
}
/
${
service
}
/.configure/configure
${
insta
}
||
die
"fatal: unable to configure
${
service_system
}
/
${
service
}
"
rm
-rf
${
service_system
}
/
${
service
}
/.configure
||
die
"fatal: unable to remove
${
service_system
}
/
${
service
}
/.configure"
fi
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment