Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
osak
lipstick
Commits
7c89c17f
Commit
7c89c17f
authored
Oct 07, 2014
by
Daniel Schulte
Browse files
Merge branch 'master' into buildhauer
Conflicts: scripts/mount-stick-repo.sh
parents
8f8be529
e9dc9a7d
Changes
3
Hide whitespace changes
Inline
Side-by-side
scripts/liprepoctl.sh
View file @
7c89c17f
...
...
@@ -3,8 +3,8 @@
ACTION
=
"
$1
"
FILENAME
=
"/etc/apt/sources.list.d/lipoffline.list"
ACTIVATED
=
`
test
-e
"
$FILENAME
"
`
DIST_CODENAME
=
"
sauc
y"
DIST_VERSION
=
"1
3.10
"
DIST_CODENAME
=
"
trust
y"
DIST_VERSION
=
"1
4.04
"
function
install_repo
()
...
...
scripts/mount-stick-repo.sh
View file @
7c89c17f
...
...
@@ -44,11 +44,11 @@ else
echo
"Stick gefunden als
$DEV
"
# ask udisks to mount it always.
udisksctl mount
--block-device
"
$DEV
"
udisksctl mount
--block-device
"
$DEV
"
||
true
# see where it is mounted
DEVFILE
=
${
DEV
#/dev/
}
MPOINT
=
"
$(
dbus-send
--print-reply
=
literal
--system
--dest
=
org.freedesktop.UDisks /org/freedesktop/UDisks
/
devices/
${
DEVFILE
}
org.freedesktop.DBus.Properties.Get string:
'org.freedesktop.UDisks
.Device
'
string:
'
Device
MountP
ath
s'
|
tail
-n
+
2
|
tr
-d
"
\ \]\[
"
|
head
-n
1
)
"
MPOINT
=
"
$(
dbus-send
--print-reply
=
literal
--system
--dest
=
org.freedesktop.UDisks
2
/org/freedesktop/UDisks
2/block_
devices/
${
DEVFILE
}
org.freedesktop.DBus.Properties.Get string:
'org.freedesktop.UDisks
2.Filesystem
'
string:
'MountP
oint
s'
|
tail
-n
+
3
|
tr
-d
"
\ \]\[
"
|
head
-n
1
| xxd
-r
-p
)
"
echo
"Der Stick it als '
$MPOINT
' gemountet"
fi
...
...
win/custom.cfg
0 → 100644
View file @
7c89c17f
# Taken from https://github.com/GAireg/grubconfig/blob/master/grub.cfg
# load windows from efi
menuentry "Windows EFI" {
search --file --set dev_root --no-floppy /EFI/Microsoft/boot/bootmgfw.efi
chainloader ($dev_root)/EFI/Microsoft/boot/bootmgfw.efi
}
\ No newline at end of file
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment